TeXinfo 4.2, much more robust html (and other formats) output, and a few

features that new FSF programs will need (e.g., gcc snapshots).

looked at by fgs@, thanks.

12 files changed, 354 insertions, 317 deletions

diff --git a/gnu/usr.bin/texinfo/doc/README b/gnu/usr.bin/texinfo/doc/README
index c10fad9797a..dc734a6e104 100644
--- a/gnu/usr.bin/texinfo/doc/README
+++ b/gnu/usr.bin/texinfo/doc/README
@@ -1,6 +1,6 @@
 This directory contains documentation on the Texinfo system and the TeX
 sources needed to process Texinfo sources.  We recommend using the
-texi2dvi included in the distribution to run a Texinfo manual through
+texi2dvi included in this distribution to run a Texinfo manual through
 TeX to produce a DVI file.
 
 The .tex files are not installed automatically because TeX installations
@@ -8,14 +8,14 @@ vary so widely.  Installing them in the wrong place would give a false
 sense of security.  So, you should simply cp *.tex to the appropriate
 place.  If your installation follows the TeX Directory Structure
 standard (http://tug.org/tds/), this will be the directory
-<texmf>/tex/texinfo/ for texinfo.tex and <texmf>/tex/plain/dvips/ for
-epsf.tex.  If you use the default installation paths, <texmf> will be
-/usr/local/share/texmf.  On systems with TeX preinstalled, as most
-GNU/Linux distributions offer, <texmf> will often be something like
-/usr/share/texmf.
+TEXMF/tex/texinfo/ for texinfo.tex, TEXMF/tex/generic/dvips/ for epsf.tex,
+and TEXMF/pdftex/plain/misc for pdfcolor.tex.  If you use the default
+installation paths, TEXMF will be /usr/local/share/texmf.  On systems
+with TeX preinstalled, as most GNU/Linux distributions offer, TEXMF
+will often be something like /usr/share/texmf.
 
 It is also possible to put these .tex files in a `local' place instead
-of overwriting existing ones, but it is more complicated.  See your TeX
+of overwriting existing ones, but this is more complicated.  See your TeX
 documentation in general and the texmf.cnf file in particular for information.
 
 If you add files to your TeX installations, not just replace existing
diff --git a/gnu/usr.bin/texinfo/doc/epsf.tex b/gnu/usr.bin/texinfo/doc/epsf.tex
index 7d4a628dd5e..db2cd2031bd 100644
--- a/gnu/usr.bin/texinfo/doc/epsf.tex
+++ b/gnu/usr.bin/texinfo/doc/epsf.tex
@@ -336,7 +336,7 @@ TeX, i.e., somewhere in the TEXINPUTS (or equivalent) path.}%
                 lly=\epsflly\space
                 urx=\epsfurx\space
                 ury=\epsfury\space
-                rwi=\number\epsftmp
+                rwi=\number\epsftmp\space
                 rhi=\number\epsfrsize
                 \epsfclipstring
                }%
@@ -544,3 +544,4 @@ TeX, i.e., somewhere in the TEXINPUTS (or equivalent) path.}%
 %
 \let\epsffile=\epsfbox
 \endinput
+
diff --git a/gnu/usr.bin/texinfo/doc/info.1 b/gnu/usr.bin/texinfo/doc/info.1
index f572a4f8003..4f7808ae7c5 100644
--- a/gnu/usr.bin/texinfo/doc/info.1
+++ b/gnu/usr.bin/texinfo/doc/info.1
@@ -1,43 +1,45 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.013.
-.TH INFO "1" "September 1999" "GNU texinfo 4.0" FSF
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
+.TH INFO "1" "April 2002" "GNU texinfo 4.2" FSF
 .SH NAME
 info \- read Info documents
 .SH SYNOPSIS
 .B info
 [\fIOPTION\fR]... [\fIMENU-ITEM\fR...]
 .SH DESCRIPTION
-.PP
 Read documentation in Info format.
 .SH OPTIONS
 .TP
-\fB\-\-apropos\fR=\fISUBJECT\fR
-look up SUBJECT in all indices of all manuals.
+\fB\-\-apropos\fR=\fISTRING\fR
+look up STRING in all indices of all manuals.
 .TP
-\fB\-\-directory\fR=\fIDIR\fR
+\fB\-d\fR, \fB\-\-directory\fR=\fIDIR\fR
 add DIR to INFOPATH.
 .TP
 \fB\-\-dribble\fR=\fIFILENAME\fR
 remember user keystrokes in FILENAME.
 .TP
-\fB\-\-file\fR=\fIFILENAME\fR
+\fB\-f\fR, \fB\-\-file\fR=\fIFILENAME\fR
 specify Info file to visit.
 .TP
-\fB\-\-help\fR
+\fB\-h\fR, \fB\-\-help\fR
 display this help and exit.
 .TP
 \fB\-\-index\-search\fR=\fISTRING\fR
 go to node pointed by index entry STRING.
 .TP
-\fB\-\-node\fR=\fINODENAME\fR
+\fB\-n\fR, \fB\-\-node\fR=\fINODENAME\fR
 specify nodes in first visited Info file.
 .TP
-\fB\-\-output\fR=\fIFILENAME\fR
+\fB\-o\fR, \fB\-\-output\fR=\fIFILENAME\fR
 output selected nodes to FILENAME.
 .TP
+\fB\-R\fR, \fB\-\-raw\-escapes\fR
+don't remove ANSI escapes from man pages.
+.TP
 \fB\-\-restore\fR=\fIFILENAME\fR
 read initial keystrokes from FILENAME.
 .TP
-\fB\-\-show\-options\fR, \fB\-\-usage\fR
+\fB\-O\fR, \fB\-\-show\-options\fR, \fB\-\-usage\fR
 go to command-line options node.
 .TP
 \fB\-\-subnodes\fR
@@ -73,8 +75,9 @@ show file ./foo.info, not searching dir
 .SH "REPORTING BUGS"
 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 1999 Free Software Foundation, Inc.
+Copyright \(co 2002 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.
diff --git a/gnu/usr.bin/texinfo/doc/install-info.1 b/gnu/usr.bin/texinfo/doc/install-info.1
index f2b8c2ace7a..a6fb8bf7f14 100644
--- a/gnu/usr.bin/texinfo/doc/install-info.1
+++ b/gnu/usr.bin/texinfo/doc/install-info.1
@@ -1,29 +1,25 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.013.
-.TH INSTALL-INFO "1" "September 1999" "GNU texinfo 4.0" FSF
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
+.TH INSTALL-INFO "1" "April 2002" "GNU texinfo 4.2" FSF
 .SH NAME
 install-info \- update info/dir entries
 .SH SYNOPSIS
 .B install-info
 [\fIOPTION\fR]... [\fIINFO-FILE \fR[\fIDIR-FILE\fR]]
 .SH DESCRIPTION
-.PP
 Install or delete dir entries from INFO-FILE in the Info directory file
 DIR-FILE.
 .SH OPTIONS
 .TP
 \fB\-\-delete\fR
 delete existing entries for INFO-FILE from DIR-FILE;
-.IP
 don't insert any new entries.
 .TP
 \fB\-\-dir\-file\fR=\fINAME\fR
 specify file name of Info directory file.
-.IP
 This is equivalent to using the DIR-FILE argument.
 .TP
 \fB\-\-entry\fR=\fITEXT\fR
 insert TEXT as an Info directory entry.
-.IP
 TEXT should have the form of an Info menu item line
 plus zero or more extra lines starting with whitespace.
 If you specify more than one entry, they are all added.
@@ -35,7 +31,6 @@ display this help and exit.
 .TP
 \fB\-\-info\-file\fR=\fIFILE\fR
 specify Info file to install in the directory.
-.IP
 This is equivalent to using the INFO-FILE argument.
 .TP
 \fB\-\-info\-dir\fR=\fIDIR\fR
@@ -43,7 +38,6 @@ same as \fB\-\-dir\-file\fR=\fIDIR\fR/dir.
 .TP
 \fB\-\-item\fR=\fITEXT\fR
 same as \fB\-\-entry\fR TEXT.
-.IP
 An Info directory entry is actually a menu item.
 .TP
 \fB\-\-quiet\fR
@@ -54,7 +48,6 @@ same as \fB\-\-delete\fR.
 .TP
 \fB\-\-section\fR=\fISEC\fR
 put this file's entries in section SEC of the directory.
-.IP
 If you specify more than one section, all the entries
 are added in each of the sections.
 If you don't specify any sections, they are determined
@@ -65,6 +58,12 @@ display version information and exit.
 .SH "REPORTING BUGS"
 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 2002 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.
 .SH "SEE ALSO"
 The full documentation for
 .B install-info
@@ -77,8 +76,3 @@ programs are properly installed at your site, the command
 .B info install-info
 .PP
 should give you access to the complete manual.
-.SH COPYRIGHT
-Copyright \(co 1999 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.
diff --git a/gnu/usr.bin/texinfo/doc/makeinfo.1 b/gnu/usr.bin/texinfo/doc/makeinfo.1
index 62d22b831b0..3500b6817c7 100644
--- a/gnu/usr.bin/texinfo/doc/makeinfo.1
+++ b/gnu/usr.bin/texinfo/doc/makeinfo.1
@@ -1,69 +1,121 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.013.
-.TH MAKEINFO "1" "September 1999" "GNU texinfo 4.0" FSF
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
+.TH MAKEINFO "1" "April 2002" "GNU texinfo 4.2" FSF
 .SH NAME
 makeinfo \- translate Texinfo documents
 .SH SYNOPSIS
 .B makeinfo
-[\fIOPTION\fR]...\fI TEXINFO-FILE\fR...
+[\fIOPTION\fR]... \fITEXINFO-FILE\fR...
 .SH DESCRIPTION
-.PP
-Translate Texinfo source documentation to various other formats:
-Info files suitable for reading online with Emacs or standalone GNU Info
-(by default); plain text (with \fB\-\-no\-headers\fR); or HTML (with \fB\-\-html\fR).
-.SH OPTIONS
+Translate Texinfo source documentation to various other formats, by default
+Info files suitable for reading online with Emacs or standalone GNU Info.
+.SS "General options:"
 .TP
-\fB\-\-commands\-in\-node\-names\fR
-allow @ commands in node names.
+\fB\-\-error\-limit\fR=\fINUM\fR
+quit after NUM errors (default 100).
 .TP
-\fB\-D\fR VAR
-define a variable, as with @set.
+\fB\-\-force\fR
+preserve output even if errors.
+.TP
+\fB\-\-help\fR
+display this help and exit.
+.TP
+\fB\-\-no\-validate\fR
+suppress node cross-reference validation.
+.TP
+\fB\-\-no\-warn\fR
+suppress warnings (but not errors).
+.TP
+\fB\-\-reference\-limit\fR=\fINUM\fR
+warn about at most NUM references (default 1000).
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+explain what is being done.
+.TP
+\fB\-\-version\fR
+display version information and exit.
+.SS "Output format selection (default is to produce Info):"
+.TP
+\fB\-\-docbook\fR
+output DocBook rather than Info.
+.TP
+\fB\-\-html\fR
+output HTML rather than Info.
+.TP
+\fB\-\-xml\fR
+output XML (TexinfoML) rather than Info.
+.SS "General output options:"
 .TP
 \fB\-E\fR, \fB\-\-macro\-expand\fR FILE
 output macro-expanded source to FILE.
+ignoring any @setfilename.
 .TP
-\fB\-\-error\-limit\fR=\fINUM\fR
-quit after NUM errors (default 100).
+\fB\-\-no\-headers\fR
+suppress node separators, Node: lines, and menus
+from Info output (thus producing plain text)
+or from HTML (thus producing shorter output);
+also, write to standard output by default.
+.TP
+\fB\-\-no\-split\fR
+suppress splitting of Info or HTML output,
+generate only one output file.
+.TP
+\fB\-\-number\-sections\fR
+output chapter and sectioning numbers.
+.TP
+\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
+output to FILE (directory if split HTML),
+.SS "Options for Info and plain text:"
+.TP
+\fB\-\-enable\-encoding\fR
+output accented and special characters in
+Info output based on @documentencoding.
 .TP
 \fB\-\-fill\-column\fR=\fINUM\fR
 break Info lines at NUM characters (default 72).
 .TP
 \fB\-\-footnote\-style\fR=\fISTYLE\fR
-output footnotes according to STYLE:
+output footnotes in Info according to STYLE:
+`separate' to put them in their own node;
+`end' to put them at the end of the node
 .IP
-`separate' to place footnotes in their own node,
-`end' to place the footnotes at the end of the
-.IP
-node in which they are defined (the default).
+in which they are defined (default).
 .TP
-\fB\-\-force\fR
-preserve output even if errors.
+\fB\-\-paragraph\-indent\fR=\fIVAL\fR
+indent Info paragraphs by VAL spaces (default 3).
+If VAL is `none', do not indent; if VAL is
+`asis', preserve existing indentation.
 .TP
-\fB\-\-help\fR
-display this help and exit.
+\fB\-\-split\-size\fR=\fINUM\fR
+split Info files at size NUM (default 50000).
+.SS "Input file options:"
 .TP
-\fB\-\-html\fR
-output HTML rather than Info format;
+\fB\-\-commands\-in\-node\-names\fR
+allow @ commands in node names.
+.TP
+\fB\-D\fR VAR
+define the variable VAR, as with @set.
 .TP
 \fB\-I\fR DIR
 append DIR to the @include search path.
 .TP
+\fB\-P\fR DIR
+prepend DIR to the @include search path.
+.TP
+\fB\-U\fR VAR
+undefine the variable VAR, as with @clear.
+.SS "Conditional processing in input:"
+.TP
 \fB\-\-ifhtml\fR
-process @ifhtml and @html text even when not
-.IP
-generating HTML.
+process @ifhtml and @html even if not generating HTML.
 .TP
 \fB\-\-ifinfo\fR
-process @ifinfo text even when generating HTML.
+process @ifinfo even if not generating Info.
 .TP
-\fB\-\-iftex\fR
-process @iftex and @tex text.
-.IP
-implies \fB\-\-no\-split\fR.
+\fB\-\-ifplaintext\fR
+process @ifplaintext even if not generating plain text.
 .TP
-\fB\-\-no\-headers\fR
-suppress Info node separators and Node: lines and
-.IP
-write to standard output without \fB\-\-output\fR.
+\fB\-\-iftex\fR
+process @iftex and @tex; implies \fB\-\-no\-split\fR.
 .TP
 \fB\-\-no\-ifhtml\fR
 do not process @ifhtml and @html text.
@@ -71,68 +123,45 @@ do not process @ifhtml and @html text.
 \fB\-\-no\-ifinfo\fR
 do not process @ifinfo text.
 .TP
+\fB\-\-no\-ifplaintext\fR
+do not process @ifplaintext text.
+.TP
 \fB\-\-no\-iftex\fR
 do not process @iftex and @tex text.
-.TP
-\fB\-\-no\-split\fR
-suppress splitting of large Info output files or
-generation of one HTML file per node.
-.TP
-\fB\-\-no\-validate\fR
-suppress node cross-reference validation.
-.TP
-\fB\-\-no\-warn\fR
-suppress warnings (but not errors).
-.TP
-\fB\-\-number\-sections\fR
-include chapter, section, etc. numbers in output.
-.TP
-\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
-output to FILE, ignoring any @setfilename.
-.TP
-\fB\-P\fR DIR
-prepend DIR to the @include search path.
-.TP
-\fB\-\-paragraph\-indent\fR=\fIVAL\fR
-indent Info paragraphs by VAL spaces (default 3).
 .IP
-if VAL is `none', do not indent;
-if VAL is `asis', preserve existing indentation.
-.TP
-\fB\-\-reference\-limit\fR=\fINUM\fR
-warn about at most NUM references (default 1000).
-.TP
-\fB\-U\fR VAR
-undefine a variable, as with @clear.
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-explain what is being done.
-.TP
-\fB\-\-version\fR
-display version information and exit.
-.PP
 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 or plain text, \fB\-\-ifinfo\fR is on and the others are off.
+if generating Info, \fB\-\-ifinfo\fR is on and the others are off;
+if generating plain text, \fB\-\-ifplaintext\fR is on and the others are off;
 .SH EXAMPLES
 .TP
 makeinfo foo.texi
 write Info to foo's @setfilename
 .TP
 makeinfo \fB\-\-html\fR foo.texi
-write HTML to foo's @setfilename
+write HTML to @setfilename
 .TP
-makeinfo \fB\-\-no\-headers\fR \fB\-o\fR - foo.texi
-write plain text to standard output
+makeinfo \fB\-\-xml\fR foo.texi
+write XML to @setfilename
 .TP
-makeinfo \fB\-\-number\-sections\fR foo.texi
-write Info with numbered sections
+makeinfo \fB\-\-docbook\fR foo.texi
+write DocBook XML to @setfilename
 .TP
-makeinfo \fB\-\-no\-split\fR foo.texi
-write one Info file however big
+makeinfo \fB\-\-no\-headers\fR foo.texi
+write plain text to standard output
+.IP
+makeinfo \fB\-\-html\fR \fB\-\-no\-headers\fR foo.texi write html without node lines, menus
+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.
+Texinfo home page: http://www.gnu.org/software/texinfo/
+.SH COPYRIGHT
+Copyright \(co 2002 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.
 .SH "SEE ALSO"
 The full documentation for
 .B makeinfo
@@ -145,8 +174,3 @@ programs are properly installed at your site, the command
 .B info makeinfo
 .PP
 should give you access to the complete manual.
-.SH COPYRIGHT
-Copyright \(co 1999 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.
diff --git a/gnu/usr.bin/texinfo/doc/mdate-sh b/gnu/usr.bin/texinfo/doc/mdate-sh
index 37171f21fbd..c079aed3e22 100644
--- a/gnu/usr.bin/texinfo/doc/mdate-sh
+++ b/gnu/usr.bin/texinfo/doc/mdate-sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Get modification time of a file or directory and pretty-print it.
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright 1995, 1996, 1997 Free Software Foundation, Inc.
 # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,11 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
 # Prevent date giving response in another language.
 LANG=C
 export LANG
diff --git a/gnu/usr.bin/texinfo/doc/stamp-vti b/gnu/usr.bin/texinfo/doc/stamp-vti
index 2d7c14922ab..c21b39a2cb5 100644
--- a/gnu/usr.bin/texinfo/doc/stamp-vti
+++ b/gnu/usr.bin/texinfo/doc/stamp-vti
@@ -1,3 +1,4 @@
-@set UPDATED 28 September 1999
-@set EDITION 4.0
-@set VERSION 4.0
+@set UPDATED 28 March 2002
+@set UPDATED-MONTH March 2002
+@set EDITION 4.2
+@set VERSION 4.2
diff --git a/gnu/usr.bin/texinfo/doc/texi2dvi.1 b/gnu/usr.bin/texinfo/doc/texi2dvi.1
index d9e98c4ca5f..f815bb5c061 100644
--- a/gnu/usr.bin/texinfo/doc/texi2dvi.1
+++ b/gnu/usr.bin/texinfo/doc/texi2dvi.1
@@ -1,12 +1,11 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.013.
-.TH TEXI2DVI "1" "September 1999" "GNU Texinfo 4.0 0.43" FSF
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
+.TH TEXI2DVI "1" "April 2002" "GNU Texinfo 4.2 0.51" FSF
 .SH NAME
 texi2dvi \- print Texinfo documents
 .SH SYNOPSIS
 .B texi2dvi
-[\fIOPTION\fR]...\fI FILE\fR...
+[\fIOPTION\fR]... \fIFILE\fR...
 .SH DESCRIPTION
-.PP
 Run each Texinfo or LaTeX FILE through TeX in turn until all
 cross-references are resolved, building all indices.  The directory
 containing each FILE is searched for included files.  The suffix of FILE
@@ -14,50 +13,55 @@ is used to determine its language (LaTeX or Texinfo).
 .PP
 Makeinfo is used to perform Texinfo macro expansion before running TeX
 when needed.
-.SH OPTIONS
-.TP
--@
-Use @input instead of \einput; for preloaded Texinfo.
+.SS "Operation modes:"
 .TP
 \fB\-b\fR, \fB\-\-batch\fR
-No interaction.
+no interaction
 .TP
 \fB\-c\fR, \fB\-\-clean\fR
-Remove all auxiliary files.
+remove all auxiliary files
 .TP
 \fB\-D\fR, \fB\-\-debug\fR
-Turn on shell debugging (set \fB\-x\fR).
-.TP
-\fB\-e\fR, \fB\-\-expand\fR
-Force macro expansion using makeinfo.
-.TP
-\fB\-I\fR DIR
-Search DIR for Texinfo files.
+turn on shell debugging (set \fB\-x\fR)
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-Display this help and exit successfully.
-.TP
-\fB\-l\fR, \fB\-\-language\fR=\fILANG\fR
-Specify the LANG of FILE: LaTeX or Texinfo.
+display this help and exit successfully
 .TP
-\fB\-p\fR, \fB\-\-pdf\fR
-Use pdftex or pdflatex for processing.
+\fB\-o\fR, \fB\-\-output\fR=\fIOFILE\fR
+leave output in OFILE (implies \fB\-\-clean\fR);
+Only one input FILE may be specified in this case
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-No output unless errors (implies \fB\-\-batch\fR).
+no output unless errors (implies \fB\-\-batch\fR)
 .TP
 \fB\-s\fR, \fB\-\-silent\fR
-Same as \fB\-\-quiet\fR.
-.TP
-\fB\-t\fR, \fB\-\-texinfo\fR=\fICMD\fR
-Insert CMD after @setfilename in copy of input file.
-Multiple values accumulate.
+same as \fB\-\-quiet\fR
 .TP
 \fB\-v\fR, \fB\-\-version\fR
-Display version information and exit successfully.
+display version information and exit successfully
 .TP
 \fB\-V\fR, \fB\-\-verbose\fR
-Report on what is done.
+report on what is done
+.SS "TeX tuning:"
+.TP
+-@
+use @input instead of \einput; for preloaded Texinfo
+.TP
+\fB\-e\fR, \fB\-\-expand\fR
+force macro expansion using makeinfo
+.TP
+\fB\-I\fR DIR
+search DIR for Texinfo files
+.TP
+\fB\-l\fR, \fB\-\-language\fR=\fILANG\fR
+specify the LANG of FILE (LaTeX or Texinfo)
+.TP
+\fB\-p\fR, \fB\-\-pdf\fR
+use pdftex or pdflatex for processing
+.TP
+\fB\-t\fR, \fB\-\-texinfo\fR=\fICMD\fR
+insert CMD after @setfilename in copy of input file
+multiple values accumulate
 .PP
 The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO,
 TEX (or PDFTEX), and TEXINDEX environment variables are used to run
@@ -65,6 +69,12 @@ those commands, if they are set.
 .SH "REPORTING BUGS"
 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 2002 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.
 .SH "SEE ALSO"
 The full documentation for
 .B texi2dvi
@@ -77,8 +87,3 @@ programs are properly installed at your site, the command
 .B info texi2dvi
 .PP
 should give you access to the complete manual.
-.SH COPYRIGHT
-Copyright \(co 1999 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.
diff --git a/gnu/usr.bin/texinfo/doc/texindex.1 b/gnu/usr.bin/texinfo/doc/texindex.1
index 6708829704c..854fed8c30e 100644
--- a/gnu/usr.bin/texinfo/doc/texindex.1
+++ b/gnu/usr.bin/texinfo/doc/texindex.1
@@ -1,12 +1,11 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.013.
-.TH TEXINDEX "1" "September 1999" "GNU texinfo 4.0" FSF
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
+.TH TEXINDEX "1" "April 2002" "GNU texinfo 4.2" FSF
 .SH NAME
 texindex \- sort Texinfo index files
 .SH SYNOPSIS
 .B texindex
-[\fIOPTION\fR]...\fI FILE\fR...
+[\fIOPTION\fR]... \fIFILE\fR...
 .SH DESCRIPTION
-.PP
 Generate a sorted index for each TeX output FILE.
 Usually FILE... is specified as `foo.??' for a document `foo.texi'.
 .SH OPTIONS
@@ -28,6 +27,12 @@ display version information and exit
 .SH "REPORTING BUGS"
 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 2002 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.
 .SH "SEE ALSO"
 The full documentation for
 .B texindex
@@ -40,8 +45,3 @@ programs are properly installed at your site, the command
 .B info texindex
 .PP
 should give you access to the complete manual.
-.SH COPYRIGHT
-Copyright \(co 1999 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.
diff --git a/gnu/usr.bin/texinfo/doc/txi-cs.tex b/gnu/usr.bin/texinfo/doc/txi-cs.tex
index d1aa88d3f20..9fa05b4afa1 100644
--- a/gnu/usr.bin/texinfo/doc/txi-cs.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-cs.tex
@@ -1,72 +1,76 @@
-% Czech translation for texinfo.tex (1999-01-24, GNU Texinfo 3.12c).

-%

-% Copyright (C) 1999 Vladimir Michl <Vladimir.Michl@mujweb.cz>

-%

-% This program is free software; you can redistribute it and/or modify

-% it under the terms of the GNU General Public License as published by

-% the Free Software Foundation; either version 2 of the License, or

-% (at your option) any later version.

-%

-% This program is distributed in the hope that it will be useful,

-% but WITHOUT ANY WARRANTY; without even the implied warranty of

-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-% GNU General Public License for more details.

-%

-% You should have received a copy of the GNU General Public License

-% along with this program; if not, write to the Free Software

-% Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

-%

-% To: Karl Berry <karl@cs.umb.edu>

-%

-\gdef\putwordAppendix{Přílohy}

-\gdef\putwordChapter{Kapitola}

-\gdef\putwordfile{soubor}

-\gdef\putwordIndexIsEmpty{(Rejstřík je prázdný)}

-\gdef\putwordIndexNonexistent{(Rejstřík neexistuje)}

-\gdef\putwordInfo{Info}

-\gdef\putwordMethodon{Metoda aktivní}

-\gdef\putwordNoTitle{Bez nadpisu}

-\gdef\putwordOf{}

-\gdef\putwordon{zapnuto}

-\gdef\putwordpage{stránka}

-\gdef\putwordsection{podkapitola}

-\gdef\putwordSection{Podkapitola}

-\gdef\putwordsee{vidět}

-\gdef\putwordSee{Vidět}

-\gdef\putwordShortTOC{Krátký obsah}

-\gdef\putwordTOC{Obsah}

-%

-\gdef\putwordMJan{ledna}

-\gdef\putwordMFeb{února}

-\gdef\putwordMMar{března}

-\gdef\putwordMApr{dubna}

-\gdef\putwordMMai{května}

-\gdef\putwordMJun{června}

-\gdef\putwordMJul{července}

-\gdef\putwordMAug{srpna}

-\gdef\putwordMSep{září}

-\gdef\putwordMOct{října}

-\gdef\putwordMNov{listopadu}

-\gdef\putwordMDec{prosince}

-%

-\gdef\putwordDefmac{Makro}

-\gdef\putwordDefspec{Speciální forma}

-\gdef\putwordDefivar{Instance proměnné}

-\gdef\putwordDefvar{Proměnná}

-\gdef\putwordDefopt{Volby}

-\gdef\putwordDeftypevar{Proměnná}

-\gdef\putwordDeffunc{Funkce}

-\gdef\putwordDeftypefun{Funkce}

-%

-% Redefine \today to produce Czech

-% preferred dates such as 28. januar 1999.

-%

-\gdef\today{%

-  \number\day.\space

-  \ifcase\month

-  \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr

-  \or\putwordMMai\or\putwordMJun\or\putwordMJul\or\putwordMAug

-  \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec

-  \fi

-  \space\number\year}

-%

+% $Id: txi-cs.tex,v 1.1.1.2 2002/06/10 13:21:49 espie Exp $
+% Czech translation for texinfo.tex.
+%
+% Copyright (C) 1999, 2000 Free Software Foundation.
+% 
+% Authors:
+% Vladimir Michl <Vladimir.Michl@mujweb.cz>
+% Stepan Kasal <kasal@suse.cz>
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program; if not, write to the Free Software
+% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+%
+\gdef\putwordAppendix{Přílohy}
+\gdef\putwordChapter{Kapitola}
+\gdef\putwordfile{soubor}
+\gdef\putwordin{v~knize}
+\gdef\putwordIndexIsEmpty{(Rejstřík je prázdný.)}
+\gdef\putwordIndexNonexistent{(Rejstřík neexistuje.)}
+\gdef\putwordInfo{Info}
+\gdef\putwordInstanceVariableof{Proměnná pro instance třídy}
+\gdef\putwordMethodon{Metoda třídy}
+\gdef\putwordNoTitle{Bez nadpisu}
+\gdef\putwordof{třídy}
+\global\let\putwordon\putwordof
+\gdef\putwordpage{stránka}
+\gdef\putwordsection{oddíl}
+\gdef\putwordSection{Oddíl}
+\gdef\putwordsee{viz}
+\gdef\putwordSee{Viz}
+\gdef\putwordShortTOC{Stručný obsah}
+\gdef\putwordTOC{Obsah}
+%
+\gdef\putwordMJan{ledna}
+\gdef\putwordMFeb{února}
+\gdef\putwordMMar{března}
+\gdef\putwordMApr{dubna}
+\gdef\putwordMMai{května}
+\gdef\putwordMJun{června}
+\gdef\putwordMJul{července}
+\gdef\putwordMAug{srpna}
+\gdef\putwordMSep{září}
+\gdef\putwordMOct{října}
+\gdef\putwordMNov{listopadu}
+\gdef\putwordMDec{prosince}
+%
+\gdef\putwordDefmac{Makro}
+\gdef\putwordDefspec{Speciální forma}
+\gdef\putwordDefvar{Proměnná}
+\gdef\putwordDefopt{Volby}
+\global\let\putwordDeftypevar\putwordDefvar
+\gdef\putwordDeffunc{Funkce}
+\global\let\putwordDeftypefun\putwordDeffunc
+%
+% Redefine \today to produce Czech
+% preferred dates such as 28. januar 1999.
+%
+\gdef\today{%
+  \number\day.\nobreak\space
+  \ifcase\month
+  \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
+  \or\putwordMMai\or\putwordMJun\or\putwordMJul\or\putwordMAug
+  \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
+  \fi
+  \penalty3000\relax\space\number\year}
+%
diff --git a/gnu/usr.bin/texinfo/doc/txi-no.tex b/gnu/usr.bin/texinfo/doc/txi-no.tex
index 899d42cf2a2..aa538d6b551 100644
--- a/gnu/usr.bin/texinfo/doc/txi-no.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-no.tex
@@ -1,72 +1,71 @@
-% Norwegian translation for texinfo.tex (1999-02-09, GNU Texinfo 3.12d).

-% Enables the use of words like Kapittel instead of Chapter, etc.

-%

-% Copyright (C) 1999 Trond Endrestřl <endrestol@hotmail.com>

-%

-% This program is free software; you can redistribute it and/or modify

-% it under the terms of the GNU General Public License as published by

-% the Free Software Foundation; either version 2 of the License, or

-% (at your option) any later version.

-%

-% This program is distributed in the hope that it will be useful,

-% but WITHOUT ANY WARRANTY; without even the implied warranty of

-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-% GNU General Public License for more details.

-%

-% You should have received a copy of the GNU General Public License

-% along with this program; if not, write to the Free Software

-% Foundation, Inc., 59 Temple Place - Suite 330, Boston,

-% MA 02111-1307, USA.

-%

-\gdef\putwordAppendix{Vedlegg}

-\gdef\putwordChapter{Kapittel}

-\gdef\putwordfile{fil}

-\gdef\putwordIndexIsEmpty{(Indeks er tom)}

-\gdef\putwordIndexNonexistent{(Indeks eksisterer ikke)}

-\gdef\putwordInfo{Info}

-\gdef\putwordMethodon{Metode p\aa}

-\gdef\putwordNoTitle{Ingen tittel}

-\gdef\putwordof{av}

-\gdef\putwordon{p\aa}

-\gdef\putwordpage{side}

-\gdef\putwordsection{avsnitt}

-\gdef\putwordSection{Avsnitt}

-\gdef\putwordsee{se}

-\gdef\putwordSee{Se}

-\gdef\putwordShortTOC{Kort innholdsfortegnelse}

-\gdef\putwordTOC{Innholdsfortegnelse}

-%

-\gdef\putwordMJan{januar}

-\gdef\putwordMFeb{februar}

-\gdef\putwordMMar{mars}

-\gdef\putwordMApr{april}

-\gdef\putwordMMay{mai}

-\gdef\putwordMJun{juni}

-\gdef\putwordMJul{juli}

-\gdef\putwordMAug{august}

-\gdef\putwordMSep{september}

-\gdef\putwordMOct{oktober}

-\gdef\putwordMNov{november}

-\gdef\putwordMDec{desember}

-%

-\gdef\putwordDefmac{Makro}

-\gdef\putwordDefspec{Spesiell form}

-\gdef\putwordDefivar{Forekomstvariabel}

-\gdef\putwordDefvar{Variabel}

-\gdef\putwordDefopt{Brukervalg}

-\gdef\putwordDeftypevar{Variabel}

-\gdef\putwordDeffunc{Funksjon}

-\gdef\putwordDeftypefun{Funksjon}

-%

-% Redefine \today to produce Norwegian

-% preferred dates such as 28. januar 1999.

-%

-\gdef\today{%

-  \number\day.\space

-  \ifcase\month

-  \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr

-  \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug

-  \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec

-  \fi

-  \space\number\year}

-%

+% Norwegian translation for texinfo.tex (1999-10-29, GNU Texinfo 4.0).
+% Enables the use of words like Kapittel instead of Chapter, etc.
+%
+% Copyright (C) 1999 Trond Endrest=F8l <endrestol@hotmail.com>
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program; if not, write to the Free Software
+% Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+% MA 02111-1307, USA.
+%
+\gdef\putwordAppendix{Vedlegg}
+\gdef\putwordChapter{Kapittel}
+\gdef\putwordfile{fil}
+\gdef\putwordIndexIsEmpty{(Indeks er tom)}
+\gdef\putwordIndexNonexistent{(Indeks eksisterer ikke)}
+\gdef\putwordInfo{Info}
+\gdef\putwordMethodon{Metode p\aa}
+\gdef\putwordNoTitle{Ingen tittel}
+\gdef\putwordof{av}
+\gdef\putwordon{p\aa}
+\gdef\putwordpage{side}
+\gdef\putwordsection{avsnitt}
+\gdef\putwordSection{Avsnitt}
+\gdef\putwordsee{se}
+\gdef\putwordSee{Se}
+\gdef\putwordShortTOC{Kort innholdsfortegnelse}
+\gdef\putwordTOC{Innholdsfortegnelse}
+%
+\gdef\putwordMJan{januar}
+\gdef\putwordMFeb{februar}
+\gdef\putwordMMar{mars}
+\gdef\putwordMApr{april}
+\gdef\putwordMMay{mai}
+\gdef\putwordMJun{juni}
+\gdef\putwordMJul{juli}
+\gdef\putwordMAug{august}
+\gdef\putwordMSep{september}
+\gdef\putwordMOct{oktober}
+\gdef\putwordMNov{november}
+\gdef\putwordMDec{desember}
+%
+\gdef\putwordDefmac{Makro}
+\gdef\putwordDefspec{Spesiell form}
+\gdef\putwordDefivar{Forekomstvariabel}
+\gdef\putwordDefvar{Variabel}
+\gdef\putwordDefopt{Brukervalg}
+\gdef\putwordDeftypevar{Variabel}
+\gdef\putwordDeffunc{Funksjon}
+\gdef\putwordDeftypefun{Funksjon}
+%
+% Redefine \today to produce Norwegian
+% preferred dates such as 28. januar 1999.
+%
+\gdef\today{%
+  \number\day.\space
+  \ifcase\month
+  \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
+  \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
+  \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
+  \fi
+  \space\number\year}
diff --git a/gnu/usr.bin/texinfo/doc/version.texi b/gnu/usr.bin/texinfo/doc/version.texi
index 2d7c14922ab..c21b39a2cb5 100644
--- a/gnu/usr.bin/texinfo/doc/version.texi
+++ b/gnu/usr.bin/texinfo/doc/version.texi
@@ -1,3 +1,4 @@
-@set UPDATED 28 September 1999
-@set EDITION 4.0
-@set VERSION 4.0
+@set UPDATED 28 March 2002
+@set UPDATED-MONTH March 2002
+@set EDITION 4.2
+@set VERSION 4.2