Fix warnings from including fdl.texi into gnat-style.texi

2015-12-10  Tom de Vries  <tom@codesourcery.com>

	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.

From-SVN: r231497

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c46eef42f8e0392bf6de14d9a91e1464dc9abdb4..9a7c01f5b99d8681ea52022a17ffa79b8e15d7ad 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-10  Tom de Vries  <tom@codesourcery.com>
+
+       PR ada/65102
+       * doc/include/fdl.texi: Add nodefaultgnufreedocumentationlicensenode
+       ifdef to allow disabling default @node GNU Free Documentation License.
+
 2015-12-10  Richard Biener  <rguenther@suse.de>
 
        * tree-ssa-structalias.c (create_function_info_for): Add missing

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 38fe3be3d4117315e552c4ba11580ab9929f9296..4ad9344d442e7743f48aafd08328780931afcbbb 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-10  Tom de Vries  <tom@codesourcery.com>
+
+       PR ada/65102
+       * gnat-style.texi: Set nodefaultgnufreedocumentationlicensenode and
+       define @node GNU Free Documentation License locally.
+
 2015-12-09  Eric Botcazou  <ebotcazou@adacore.com>
 
        PR ada/66526

diff --git a/gcc/ada/gnat-style.texi b/gcc/ada/gnat-style.texi
index 1fa7688b1730a2d86910ccad6a8b8bdbca226c9e..50adaabc993e07fb114dde5794103cbe07eea655 100644 (file)
--- 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 8f3d7be2e80b23b91287259902c8647e3e42bb25..4e3457fe9c47e12a0a4acea4cddd49a8b921acc9 100644 (file)
--- 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