From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12459 invoked by alias); 24 Aug 2015 15:17:01 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 12437 invoked by uid 89); 24 Aug 2015 15:17:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 24 Aug 2015 15:17:00 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1ZTtUW-0002Jz-5O from Tom_deVries@mentor.com ; Mon, 24 Aug 2015 08:16:56 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.224.2; Mon, 24 Aug 2015 16:16:54 +0100 Message-ID: <55DB3563.1080906@mentor.com> Date: Mon, 24 Aug 2015 15:18:00 -0000 From: Tom de Vries User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: Gerald Pfeifer CC: Arnaud Charlet , GCC Patches Subject: [PING][PATCH] Fix warnings from including fdl.texi into gnat-style.texi References: <54E9F4D2.9050504@mentor.com> <20150222173714.GA3798@adacore.com> <550BF22A.4060003@mentor.com> <557D8A99.8000705@mentor.com> In-Reply-To: <557D8A99.8000705@mentor.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-SW-Source: 2015-08/txt/msg01426.txt.bz2 On 14-06-15 16:07, Tom de Vries wrote: > On 23/03/15 16:00, Gerald Pfeifer wrote: >> On Fri, 20 Mar 2015, Tom de Vries wrote: >>>> The gnat-style.texi part is OK. I cannot approve the fdl part though. >>> Gerald, >>> >>> Can you approve the fdl part? >> >> Let's assume I can. Okay. >> >> Can you just describe the _why_ a bit in a @comment (in simple >> words beyond showing the error message), that is, what the issue >> is and how you avoid it? That should help someone coming in >> later, trying to understand. >> > > Patch updated with comment. > > OK for trunk? > Ping. Original submission at https://gcc.gnu.org/ml/gcc-patches/2015-06/msg00975.html . Thanks, - Tom > > > 0001-Fix-warnings-from-including-fdl.texi-into-gnat-style.patch > > > Fix warnings from including fdl.texi into gnat-style.texi > > 2015-02-22 Tom de Vries > > PR ada/65102 > * doc/include/fdl.texi: Add nodefaultgnufreedocumentationlicensenode > ifdef to allow disabling default @node GNU Free Documentation License. > > * gnat-style.texi: Set nodefaultgnufreedocumentationlicensenode and > define @node GNU Free Documentation License locally. > --- > gcc/ada/gnat-style.texi | 3 +++ > gcc/doc/include/fdl.texi | 7 +++++++ > 2 files changed, 10 insertions(+) > > diff --git a/gcc/ada/gnat-style.texi b/gcc/ada/gnat-style.texi > index 1fa7688..50adaab 100644 > --- a/gcc/ada/gnat-style.texi > +++ b/gcc/ada/gnat-style.texi > @@ -937,6 +937,9 @@ except that they are all lower case. > @c ********************************** > @c * GNU Free Documentation License * > @c ********************************** > +@node GNU Free Documentation License,Index, Program Structure, Top > +@unnumberedsec GNU Free Documentation License > +@set nodefaultgnufreedocumentationlicensenode > @include fdl.texi > @c GNU Free Documentation License > @cindex GNU Free Documentation License > diff --git a/gcc/doc/include/fdl.texi b/gcc/doc/include/fdl.texi > index 8f3d7be..4e3457f 100644 > --- a/gcc/doc/include/fdl.texi > +++ b/gcc/doc/include/fdl.texi > @@ -30,9 +30,16 @@ of this license document, but changing it is not allowed. > @end ifset > @c man begin DESCRIPTION > @ifclear gfdlhtml > +@comment For some cases, this default @node/@unnumbered is not applicable and > +@comment causes warnings. In those cases, the including file can set > +@comment nodefaultgnufreedocumentationlicensenode and provide it's own version. > +@comment F.i., when this file is included in an @raisesections context, the > +@comment including file can use an @unnumberedsec. > +@ifclear nodefaultgnufreedocumentationlicensenode > @node GNU Free Documentation License > @unnumbered GNU Free Documentation License > @end ifclear > +@end ifclear > > @cindex FDL, GNU Free Documentation License > @center Version 1.3, 3 November 2008 > -- 1.9.1 >