texi2pod.pl: Handle @ifnottex, @iftex and @display.

contrib:
	* texi2pod.pl: Handle @ifnottex, @iftex and @display.  Handle @var
	in verbatim blocks specially.  Handle @unnumbered, @unnumberedsec
	and @center.  Allow [a-z] after @enumerate.  Handle 0 and numbers
	greater than 9 in enumerations.

gcc:
	* Makefile.in (POD2MAN): Don't include --section=1.
	(manext): Rename to man1ext.  All users changed.
	(man7ext): New.
	(man7dir): New.
	(generated-manpages): Also depend on $(docdir)/gfdl.7,
	$(docdir)/gpl.7, and $(docdir)/fsf-funding.7.
	($(docdir)/gcov.1, $(docdir)/cpp.1, $(docdir)/gcc.1): Include
	--section=1 in calls to $(POD2MAN).
	($(docdir)/gfdl.7, $(docdir)/gpl.7, $(docdir)/fsf-funding.7): New.
	(maintainer-clean, install, uninstall): Handle the new man pages.
	($(docdir)/cpp.info, cpp.dvi): Depend on fdl.texi.
	(installdirs): Create man7dir.
	* doc/cpp.texi: Include GFDL in this manual.  In the man page,
	refer to gfdl(7) for the GFDL.  Apply Front Cover and Back Cover
	texts to man page.  Include gpl(7), gfdl(7) and fsf-funding(7) in
	the SEE ALSO man page section.
	* doc/gcov.texi: Apply GFDL to man page.  Include gpl(7), gfdl(7)
	and fsf-funding(7) in the SEE ALSO man page section.
	* doc/invoke.texi: Apply GFDL to man page.  Include gpl(7),
	gfdl(7) and fsf-funding(7) in the SEE ALSO man page section.
	* doc/include/fdl.texi, doc/include/funding.texi,
	doc/include/gpl.texi: Adjust for conversion by texi2pod.pl.
	* doc/.cvsignore: Add gfdl.7, gpl.7 and fsf-funding.7.

gcc/cp:
	* Make-lang.in: Change all uses of $(manext) to $(man1ext).

gcc/f:
	* Make-lang.in: Change all uses of $(manext) to $(man1ext).

From-SVN: r46998

1 files changed, 10 insertions, 9 deletions

diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi
index ed167e4..158474e 100644
--- a/gcc/doc/cpp.texi
+++ b/gcc/doc/cpp.texi
@@ -15,22 +15,18 @@ Free Software Foundation, Inc.
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation.  A copy of
-the license is included in the accompanying manual for GCC, in the
-section ``GNU Free Documentation License''.
+the license is included in the
 @c man end
-@end macro
-
-@c The manpage doesn't have Front-Cover and Back-Cover Texts, but the
-@c complete manual does.  -zw
-
+section entitled ``GNU Free Documentation License''.
 @ignore
 @c man begin COPYRIGHT
-This manual contains no Invariant Sections, and has no Front-Cover Texts
-or Back-Cover Texts.
+man page gfdl(7).
 @c man end
 @end ignore
+@end macro
 
 @macro covertexts
+@c man begin COPYRIGHT
 This manual contains no Invariant Sections.  The Front-Cover Texts are
 (a) (see below), and the Back-Cover Texts are (b) (see below).
 
@@ -43,6 +39,7 @@ This manual contains no Invariant Sections.  The Front-Cover Texts are
      You have freedom to copy and modify this GNU Manual, like GNU
      software.  Copies published by the Free Software Foundation raise
      funds for GNU development.
+@c man end
 @end macro
 
 @macro gcctabopt{body}
@@ -92,6 +89,7 @@ useful on its own.
 * Traditional Mode::
 * Implementation Details::
 * Invocation::
+* GNU Free Documentation License::
 * Index of Directives::
 * Concept Index::
 
@@ -3806,6 +3804,7 @@ cpp [@option{-D}@var{macro}[=@var{defn}]@dots{}] [@option{-U}@var{macro}]
 Only the most useful options are listed here; see below for the remainder.
 @c man end
 @c man begin SEEALSO
+gpl(7), gfdl(7), fsf-funding(7),
 gcc(1), as(1), ld(1), and the Info entries for @file{cpp}, @file{gcc}, and
 @file{binutils}.
 @c man end
@@ -4280,6 +4279,8 @@ preprocess as normal.  With two dashes, exit immediately.
 @end table
 @c man end
 
+@include fdl.texi
+
 @page
 @node Index of Directives
 @unnumbered Index of Directives