cpp.texi: Minor update.

1999-06-14   Zack Weinberg   <zack@rabi.columbia.edu>
	* cpp.texi: Minor update.
	* cpp.1: Regenerate from cpp.texi, using...
	* contrib/texi2pod.pl: ...this (new file) plus some hand tweaks.

From-SVN: r27525

1 files changed, 34 insertions, 11 deletions

diff --git a/gcc/cpp.texi b/gcc/cpp.texi
index 751cd8b..4afcd97 100644
--- a/gcc/cpp.texi
+++ b/gcc/cpp.texi
@@ -16,8 +16,7 @@
 @ifinfo
 This file documents the GNU C Preprocessor.
 
-Copyright 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1997, 1998, 1999
-Free Software Foundation, Inc.
+Copyright 1987, 1989, 1991-1999 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -42,7 +41,7 @@ into another language, under the above conditions for modified versions.
 @titlepage
 @c @finalout
 @title The C Preprocessor
-@subtitle Last revised September 1998
+@subtitle Last revised May 1999
 @subtitle for GCC version 2
 @author Richard M. Stallman
 @page
@@ -51,7 +50,8 @@ This booklet is eventually intended to form the first chapter of a GNU
 C Language manual.
 
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1987, 1989, 1991-1998
+@c man begin COPYRIGHT
+Copyright @copyright{} 1987, 1989, 1991-1999
 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -65,11 +65,13 @@ permission notice identical to this one.
 
 Permission is granted to copy and distribute translations of this manual
 into another language, under the above conditions for modified versions.
+@c man end
 @end titlepage
 @page
 
 @node Top, Global Actions,, (DIR)
 @chapter The C Preprocessor
+@c man begin DESCRIPTION
 
 The C preprocessor is a @dfn{macro processor} that is used automatically by
 the C compiler to transform your program before actual compilation.  It is
@@ -117,6 +119,7 @@ problems if you apply it to other kinds of languages, because it assumes
 that it is dealing with C@.  For example, the C preprocessor sometimes
 outputs extra white space to avoid inadvertent C token concatenation,
 and this may cause problems with other languages.
+@c man end
 
 @menu
 * Global Actions::    Actions made uniformly on all input files.
@@ -2516,15 +2519,35 @@ Most often when you use the C preprocessor you will not have to invoke it
 explicitly: the C compiler will do so automatically.  However, the
 preprocessor is sometimes useful on its own.
 
+@ignore
+@c man begin SYNOPSIS
+cpp [@samp{-P}] [@samp{-C}] [@samp{-gcc}] [@samp{-traditional}]
+    [@samp{-undef}] [@samp{-trigraphs}] [@samp{-pedantic}]
+    [@samp{-W}@var{warn}...] [@samp{-I}@var{dir}...]
+    [@samp{-D}@var{macro}[=@var{defn}]...] [@samp{-U}@var{macro}]
+    [@samp{-A}@var{predicate}(@var{answer})]
+    [@samp{-M}|@samp{-MM}|@samp{-MD}|@samp{-MMD} [@samp{-MG}]]
+    [@samp{-x} @var{language}] [@samp{-std=}@var{standard}]
+    @var{infile} @var{outfile}
+
+Only the most useful options are listed here; see below for the remainder.
+@c man end
+@c man begin SEEALSO
+gcc(1), as(1), ld(1), and the Info entries for @file{cpp}, @file{gcc}, and
+@file{binutils}.
+@c man end
+@end ignore
+
+@c man begin OPTIONS
 The C preprocessor expects two file names as arguments, @var{infile} and
 @var{outfile}.  The preprocessor reads @var{infile} together with any other
 files it specifies with @samp{#include}.  All the output generated by the
 combined input files is written in @var{outfile}.
 
-Either @var{infile} or @var{outfile} may be @samp{-}, which as @var{infile}
-means to read from standard input and as @var{outfile} means to write to
-standard output.  Also, if @var{outfile} or both file names are omitted,
-the standard output and standard input are used for the omitted file names.
+Either @var{infile} or @var{outfile} may be @samp{-}, which as
+@var{infile} means to read from standard input and as @var{outfile}
+means to write to standard output.  Also, if either file is omitted, it
+means the same as if @samp{-} had been specified for that file.
 
 @cindex options
 Here is a table of command options accepted by the C preprocessor.
@@ -2751,8 +2774,8 @@ effect.
 @item -U @var{name}
 @findex -U
 Do not predefine @var{name}.  If both @samp{-U} and @samp{-D} are
-specified for one name, the @samp{-U} beats the @samp{-D} and the name
-is not predefined.
+specified for one name, whichever one appears later on the command line
+wins.
 
 @item -undef
 @findex -undef
@@ -2952,8 +2975,8 @@ above.  In a future release, this option will be replaced by
 @findex -$
 Forbid the use of @samp{$} in identifiers.  The C standard does not
 permit this, but it is a common extension.
-
 @end table
+@c man end
 
 @node Concept Index, Index, Invocation, Top
 @unnumbered Concept Index