summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvries <vries@138bc75d-0d04-0410-961f-82ee72b054a4>2015-12-10 09:19:04 +0000
committervries <vries@138bc75d-0d04-0410-961f-82ee72b054a4>2015-12-10 09:19:04 +0000
commit6c2acfc4892316b46df0fe4a6769fb6766ab1e0b (patch)
tree84556fefacbfe4578e3682eb14adcb6c1592921f
parent8f081a6b5a3f5c8cb86bb6458503a39e32a0f5de (diff)
downloadgcc-6c2acfc4892316b46df0fe4a6769fb6766ab1e0b.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231497 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/ada/ChangeLog6
-rw-r--r--gcc/ada/gnat-style.texi3
-rw-r--r--gcc/doc/include/fdl.texi7
4 files changed, 22 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c46eef42f8e..9a7c01f5b99 100644
--- 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 38fe3be3d41..4ad9344d442 100644
--- 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 1fa7688b173..50adaabc993 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 8f3d7be2e80..4e3457fe9c4 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