1 files changed, 26 insertions, 9 deletions
diff --git a/contrib/texinfo/doc/makeinfo.1 b/contrib/texinfo/doc/makeinfo.1
index 75e9fe4..7b46491 100644
--- a/contrib/texinfo/doc/makeinfo.1
+++ b/contrib/texinfo/doc/makeinfo.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.29.
-.TH MAKEINFO "1" "June 2003" "makeinfo 4.6" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
+.TH MAKEINFO "1" "December 2004" "makeinfo 4.8" "User Commands"
 .SH NAME
 makeinfo \- translate Texinfo documents
 .SH SYNOPSIS
@@ -20,7 +20,7 @@ preserve output even if errors.
 display this help and exit.
 .TP
 \fB\-\-no\-validate\fR
-suppress node cross-reference validation.
+suppress node cross\-reference validation.
 .TP
 \fB\-\-no\-warn\fR
 suppress warnings (but not errors).
@@ -36,17 +36,20 @@ display version information and exit.
 .SS "Output format selection (default is to produce Info):"
 .TP
 \fB\-\-docbook\fR
-output DocBook XML rather than Info.
+output Docbook XML rather than Info.
 .TP
 \fB\-\-html\fR
 output HTML rather than Info.
 .TP
 \fB\-\-xml\fR
 output Texinfo XML rather than Info.
+.TP
+\fB\-\-plaintext\fR
+output plain text rather than Info.
 .SS "General output options:"
 .TP
 \fB\-E\fR, \fB\-\-macro\-expand\fR FILE
-output macro-expanded source to FILE.
+output macro\-expanded source to FILE.
 ignoring any @setfilename.
 .TP
 \fB\-\-no\-headers\fR
@@ -91,7 +94,12 @@ split Info files at size NUM (default 300000).
 .TP
 \fB\-\-css\-include\fR=\fIFILE\fR
 include FILE in HTML <style> output;
-read stdin if FILE is -.
+read stdin if FILE is \-.
+.SS "Options for XML and Docbook:"
+.TP
+\fB\-\-output\-indent\fR=\fIVAL\fR
+indent XML elements by VAL spaces (default 2).
+If VAL is 0, ignorable whitespace is dropped.
 .SS "Input file options:"
 .TP
 \fB\-\-commands\-in\-node\-names\fR
@@ -110,6 +118,10 @@ prepend DIR to the @include search path.
 undefine the variable VAR, as with @clear.
 .SS "Conditional processing in input:"
 .TP
+\fB\-\-ifdocbook\fR
+process @ifdocbook and @docbook even if
+not generating Docbook.
+.TP
 \fB\-\-ifhtml\fR
 process @ifhtml and @html even if not generating HTML.
 .TP
@@ -125,6 +137,9 @@ process @iftex and @tex; implies \fB\-\-no\-split\fR.
 \fB\-\-ifxml\fR
 process @ifxml and @xml.
 .TP
+\fB\-\-no\-ifdocbook\fR
+do not process @ifdocbook and @docbook text.
+.TP
 \fB\-\-no\-ifhtml\fR
 do not process @ifhtml and @html text.
 .TP
@@ -140,6 +155,8 @@ do not process @iftex and @tex text.
 \fB\-\-no\-ifxml\fR
 do not process @ifxml and @xml text.
 .IP
+Also, for the \fB\-\-no\-ifFORMAT\fR options, do process @ifnotFORMAT text.
+.IP
 The defaults for the @if... conditionals depend on the output format:
 if generating HTML, \fB\-\-ifhtml\fR is on and the others are off;
 if generating Info, \fB\-\-ifinfo\fR is on and the others are off;
@@ -166,11 +183,11 @@ makeinfo \fB\-\-html\fR \fB\-\-no\-headers\fR foo.texi write html without node l
 makeinfo \fB\-\-number\-sections\fR foo.texi   write Info with numbered sections
 makeinfo \fB\-\-no\-split\fR foo.texi          write one Info file however big
 .SH "REPORTING BUGS"
-Email bug reports to bug-texinfo@gnu.org,
-general questions and discussion to help-texinfo@gnu.org.
+Email bug reports to bug\-texinfo@gnu.org,
+general questions and discussion to help\-texinfo@gnu.org.
 Texinfo home page: http://www.gnu.org/software/texinfo/
 .SH COPYRIGHT
-Copyright \(co 2003 Free Software Foundation, Inc.
+Copyright \(co 2004 Free Software Foundation, Inc.
 There is NO warranty.  You may redistribute this software
 under the terms of the GNU General Public License.
 For more information about these matters, see the files named COPYING.