From patchwork Mon May 25 12:10:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1297321 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=sourceware.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=w+NHxOw1; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49VwsP1XTtz9sSs for ; Mon, 25 May 2020 22:10:33 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2061B3890408; Mon, 25 May 2020 12:10:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2061B3890408 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1590408622; bh=y3Ese7jgwZY0g06PVN7v2jeTd3lW/ZcUF8Jc8Y23H30=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=w+NHxOw1gTGaExY/6PZFzmXivkl9UN/9iCZQzR5pOyWGsUDk2YdoYMfunx/DwRqcD S5pEPG8qHgNUyREoZxqDgaW5PnCvDszdgfkT1D0DF000AEqicamY1RvuBjWBJxVEQY oD7V5BjJk0mQg8zhwmDkYA5Ge7HzeW0u060o7Oq8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by sourceware.org (Postfix) with ESMTP id A7417388F060 for ; Mon, 25 May 2020 12:10:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A7417388F060 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-72-_4pyVe9jMGOhk1hAnwX4gA-1; Mon, 25 May 2020 08:10:16 -0400 X-MC-Unique: _4pyVe9jMGOhk1hAnwX4gA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0A3F28018A3 for ; Mon, 25 May 2020 12:10:16 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-112-121.ams2.redhat.com [10.36.112.121]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 812D26062D for ; Mon, 25 May 2020 12:10:15 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH] manual: Show copyright information not just in the printed manual Date: Mon, 25 May 2020 14:10:13 +0200 Message-ID: <878shgxlju.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" @insertcopying was not used at all in the Info and HTML versions. As a result, the notices that need to be present according to the GNU Free Documentation License were missing. This commit shows these notices above the table of contents in the HTML version, and as part of the Main Menu node in the Info version. Remove the "This file documents" line because it is redudant with the following line. Tested-by: Carlos O'Donell Reviewed-by: Carlos O'Donell --- manual/libc.texinfo | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/manual/libc.texinfo b/manual/libc.texinfo index 692a8f20b2..9c8df2cba7 100644 --- a/manual/libc.texinfo +++ b/manual/libc.texinfo @@ -40,8 +40,6 @@ @set FDL_VERSION 1.3 @copying -This file documents @theglibc{}. - This is @c Disabled (printed editions, see above). @c Edition @value{EDITION} of @@ -105,20 +103,24 @@ supports it in developing GNU and promoting software freedom.'' @end titlepage +@c @titlepage is only visible in the printed manual. Show the +@c copyright information elsewhere in other renderings. For the HTML +@c version, it should come above the short table of contents. In the +@c Info manual, the option below is used. +@ifhtml +@insertcopying +@end ifhtml + @shortcontents @contents @ifnottex @node Top, Introduction, (dir), (dir) @top Main Menu -This is @c Disabled (printed editions, see above). -@c Edition @value{EDITION} of -@cite{The GNU C Library Reference Manual}, for Version @value{VERSION} -@ifclear PKGVERSION_DEFAULT -@value{PKGVERSION} -@end ifclear -of @theglibc{}. +@ifnothtml +@insertcopying +@end ifnothtml @end ifnottex @include top-menu.texi