From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 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 dcvr.yhbt.net (Postfix) with ESMTPS id D8B611F5AE for ; Thu, 2 Jul 2020 17:53:54 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E349F3851C1B; Thu, 2 Jul 2020 17:53:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E349F3851C1B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1593712434; bh=45zsvVQ5IHINx/FOkQIczgpQNc1GjZJpFuODvQkad6k=; h=Subject:To:References:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=lkObDdPJPtB+Vid+a/7iPRQG5Wnl+8Y0abIg5RLsNseyGHBAtoOumEbh3aAZWKf7C BA+u20vgRT9E+V6nVe/FfItqOXLvYVwAbCQGyFBn9eGNmuyhFqcKsjBCWFkmWK2NJC Hz9+djwUPn/CW1m0meIF/njVAZArgnH7C7gNhRk0= Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by sourceware.org (Postfix) with ESMTP id 5DC903851C1B for ; Thu, 2 Jul 2020 17:53:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5DC903851C1B Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-352-PBXMKlrsPayCABjqcLjxKA-1; Thu, 02 Jul 2020 13:53:49 -0400 X-MC-Unique: PBXMKlrsPayCABjqcLjxKA-1 Received: by mail-qt1-f198.google.com with SMTP id h10so6344161qtc.4 for ; Thu, 02 Jul 2020 10:53:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=45zsvVQ5IHINx/FOkQIczgpQNc1GjZJpFuODvQkad6k=; b=aaLEX4mF9Laxlb+KmS0Ci7vDH1yemVt9FgVyhd22gHSFIBBw1pmC2+ujwTTu5LSHtg PuVwleLPERrDXAUjN1T+ikWkYb5RYAYHkOpfEPW90Ed+WdOW7Uutpi1gY58DCJKMvXzI NiGGfGZ/0aa+fH3WGa7CuEtN9Ru95UyGfvmxCYAL19Uqkp6oPhz3uowSihEqdKjaXyYk dRQcw2JCKL4htV3YBLTJctftQ+vB9Q838jVFFvAruvSwYeiAOJY6OxjR+Inn7DrwST+e Nlp6klhynRAYEaltp1eAZ+PIxgMNKq/hYzAd270Iy8zskc75H+CgZKwnDc1JxRXx1bUp dgfg== X-Gm-Message-State: AOAM532P7VqfgWa6ZNMea6Suy9sOWswAMRbNML2Vi+/JhUZYAzX+lXrG G6d6/1DzGw2L2xFQbk77gr55O8VKufZb8xX611bGJvo+YT7wu9HZy1ueNz0NBFJUtqcCQtdvLfc GDdqqLs9JBmZM7jcwe5SO X-Received: by 2002:aed:3b29:: with SMTP id p38mr33585609qte.350.1593712428876; Thu, 02 Jul 2020 10:53:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0bgWxWnUadGABPBHK+oJSOwrCXV7FSXCMmiAH7XLm8AVsf7PR/SvAuX+Y5MXTb5FQfZzf/Q== X-Received: by 2002:aed:3b29:: with SMTP id p38mr33585595qte.350.1593712428589; Thu, 02 Jul 2020 10:53:48 -0700 (PDT) Received: from [192.168.1.4] (198-84-170-103.cpe.teksavvy.com. [198.84.170.103]) by smtp.gmail.com with ESMTPSA id g16sm11167868qko.5.2020.07.02.10.53.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 Jul 2020 10:53:47 -0700 (PDT) Subject: Re: [PATCH] manual: Show copyright information not just in the printed manual To: Florian Weimer , libc-alpha@sourceware.org References: <878shgxlju.fsf@oldenburg2.str.redhat.com> Organization: Red Hat Message-ID: Date: Thu, 2 Jul 2020 13:53:46 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <878shgxlju.fsf@oldenburg2.str.redhat.com> Content-Language: en-US X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit 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: , From: Carlos O'Donell via Libc-alpha Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" On 5/25/20 8:10 AM, Florian Weimer via Libc-alpha wrote: > @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 s/redudant/redundant/g > following line. OK for master. Reviewed pdf and html and they look good to me. 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{}. > - OK. > 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 OK. > + > @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 OK. > @end ifnottex > > @include top-menu.texi > -- Cheers, Carlos.