-diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
---- texinfo-3.12s/doc/texinfo.txi Mon Aug 9 22:43:55 1999
-+++ texinfo-3.12s.new/doc/texinfo.txi Wed Sep 8 22:06:16 1999
+diff -Nur texinfo-4.0b.orig/doc/info-stnd.texi texinfo-4.0b/doc/info-stnd.texi
+--- texinfo-4.0b.orig/doc/info-stnd.texi Fri Jun 25 23:57:05 1999
++++ texinfo-4.0b/doc/info-stnd.texi Tue May 22 19:55:40 2001
+@@ -10,9 +10,9 @@
+
+ @include version.texi
+
+-@dircategory Texinfo documentation system
++@dircategory Texinfo documentation system:
+ @direntry
+-* Standalone info program: (info-stnd). Standalone Info-reading program.
++* Standalone info program: (info-stnd). Standalone Info-reading program
+ @end direntry
+
+ @ifinfo
+diff -Nur texinfo-4.0b.orig/doc/info.texi texinfo-4.0b/doc/info.texi
+--- texinfo-4.0b.orig/doc/info.texi Tue May 1 21:45:12 2001
++++ texinfo-4.0b/doc/info.texi Tue May 22 19:55:40 2001
+@@ -8,9 +8,9 @@
+ @comment %**end of header
+ @comment $Id$
+
+-@dircategory Texinfo documentation system
++@dircategory Texinfo documentation system:
+ @direntry
+-* Info: (info). Documentation browsing system.
++* Info: (info). Documentation browsing system
+ @end direntry
+
+ @ifinfo
+diff -Nur texinfo-4.0b.orig/doc/texinfo.txi texinfo-4.0b/doc/texinfo.txi
+--- texinfo-4.0b.orig/doc/texinfo.txi Tue May 1 21:36:20 2001
++++ texinfo-4.0b/doc/texinfo.txi Tue May 22 20:00:29 2001
@@ -22,13 +22,13 @@
@comment %**end of header
-* install-info: (texinfo)Invoking install-info. Update info/dir entries.
-* texi2dvi: (texinfo)Format with texi2dvi. Print Texinfo documents.
-* texindex: (texinfo)Format with tex/texindex. Sort Texinfo index files.
--* makeinfo: (texinfo)makeinfo Preferred. Translate Texinfo source.
+-* makeinfo: (texinfo)Invoking makeinfo. Translate Texinfo source.
+* Texinfo: (texinfo) The GNU documentation format
+* install-info: (texinfo)install-info Update info/dir entries
+* texi2dvi: (texinfo)texi2dvi Print Texinfo documents
@end direntry
@c Before release, run C-u C-c C-u C-a (texinfo-all-menus-update with a
-@@ -538,8 +538,8 @@
+@@ -520,8 +520,8 @@
Formatting and Printing Hardcopy
* Use TeX:: Use @TeX{} to format for hardcopy.
* Print with lpr:: How to print.
* Within Emacs:: How to format and print from an Emacs shell.
* Texinfo Mode Printing:: How to format and print in Texinfo mode.
-@@ -582,7 +582,7 @@
+@@ -564,7 +564,7 @@
located in other directories.
* Installing Dir Entries:: How to specify what menu entry to add
to the Info directory.
-* Invoking install-info:: @code{install-info} options.
+* install-info:: @code{install-info} options.
- Sample Permissions
+ Include Files
-@@ -610,7 +610,7 @@
+@@ -586,7 +586,7 @@
Formatting Mistakes
* Debugging with Info:: How to catch errors with Info formatting.
* Debugging with TeX:: How to catch errors with @TeX{} formatting.
* Using texinfo-show-structure:: How to use @code{texinfo-show-structure}.
-@@ -2286,7 +2286,7 @@
+@@ -2260,7 +2260,7 @@
you must run the @code{texindex} command after first running the
@code{tex} typesetting command; and then you must run the @code{tex}
command again. Or else run the @code{texi2dvi} command which
Often, when you are writing a document, you want to typeset and print
only part of a file to see what it will look like. You can use the
-@@ -3877,8 +3877,8 @@
+@@ -3848,8 +3848,8 @@
You need to include the @code{@@set@dots{}contentsaftertitlepage}
commands early in the document (just after @code{@@setfilename}, for
without altering the source file at all. For example:
@example
texi2dvi --texinfo=@@setshortcontentsaftertitlepage foo.texi
-@@ -12629,8 +12629,8 @@
+@@ -12759,8 +12759,8 @@
@menu
* Use TeX:: Use @TeX{} to format for hardcopy.
* Print with lpr:: How to print.
* Within Emacs:: How to format and print from an Emacs shell.
* Texinfo Mode Printing:: How to format and print in Texinfo mode.
-@@ -12660,7 +12660,7 @@
+@@ -12790,7 +12790,7 @@
make an Info file (@pxref{Creating an Info File}).
@section Format with @code{tex} and @code{texindex}
@cindex Shell formatting with @code{tex} and @code{texindex}
@cindex Formatting with @code{tex} and @code{texindex}
-@@ -12681,7 +12681,7 @@
+@@ -12811,7 +12811,7 @@
@pindex texindex
The @code{tex} formatting command itself does not sort the indices; it
writes an output file of unsorted index data. (The @code{texi2dvi}
Format with @code{texi2dvi}}.) To generate a printed index after
running the @code{tex} command, you first need a sorted index to work
from. The @code{texindex} command sorts indices. (The source file
-@@ -12755,7 +12755,7 @@
+@@ -12888,7 +12888,7 @@
@pindex texi2dvi
Alternatively, it's a one-step process: run @code{texi2dvi}
You need not run @code{texindex} each time after you run @code{tex}. If
you do not, on the next run, the @code{tex} formatting command will use
-@@ -12787,7 +12787,7 @@
+@@ -12920,7 +12920,7 @@
(@pxref{Pointer Validation}).
@section Format with @code{texi2dvi}
@pindex texi2dvi @r{(shell script)}
-@@ -12823,7 +12823,7 @@
+@@ -12956,7 +12956,7 @@
For a list of other options, run @samp{texi2dvi --help}.
@section Shell Print Using @code{lpr -d}
@pindex lpr @r{(DVI print command)}
-@@ -13331,7 +13331,7 @@
+@@ -13465,7 +13465,7 @@
@xref{small}, for information about
commands that make it easier to produce examples for a smaller manual.
@TeX{}}, for other ways to format with @code{@@smallbook} that do not
require changing the source file.
-@@ -13360,7 +13360,7 @@
+@@ -13495,7 +13495,7 @@
@end group
@end example
-@xref{Format with texi2dvi}, and @ref{Preparing for TeX,,Preparing for
+@xref{texi2dvi}, and @ref{Preparing for TeX,,Preparing for
- @TeX{}}, for other ways to format with @code{@@afourpaper} that do not
+ @TeX{}}, for other ways to format for different paper sizes that do not
require changing the source file.
-@@ -13406,7 +13406,7 @@
+@@ -13541,7 +13541,7 @@
margins, you must define a new command in @file{texinfo.tex} (or
@file{texinfo.cnf}, @pxref{Preparing for TeX,,Preparing for @TeX{}}).
@TeX{}}, for other ways to specify @code{@@pagesizes} that do not
require changing the source file.
-@@ -14222,7 +14222,7 @@
+@@ -14386,7 +14386,7 @@
located in other directories.
* Installing Dir Entries:: How to specify what menu entry to add
to the Info directory.
@end menu
-@@ -14447,7 +14447,7 @@
- special CTRL-_ character that Info needs will be present.
-
-
--@node Installing Dir Entries, Invoking install-info, Other Info Directories, Install an Info File
-+@node Installing Dir Entries, install-info, Other Info Directories, Install an Info File
- @subsection Installing Info Directory Files
-
- When you install an Info file onto your system, you can use the program
-@@ -14468,7 +14468,7 @@
+@@ -14633,7 +14633,7 @@
@@dircategory Texinfo documentation system
@@direntry
* Texinfo: (texinfo). The GNU documentation format.
@dots{}
@@end direntry
@end smallexample
-@@ -14479,7 +14479,7 @@
+@@ -14644,7 +14644,7 @@
INFO-DIR-SECTION Texinfo documentation system
START-INFO-DIR-ENTRY
* Texinfo: (texinfo). The GNU documentation format.
@dots{}
END-INFO-DIR-ENTRY
@end smallexample
-@@ -14505,8 +14505,8 @@
+@@ -14670,8 +14670,8 @@
entry for the manual as a whole in the appropriate other category.
@pindex install-info
-@@ -17047,7 +17047,7 @@
+@@ -17064,7 +17064,7 @@
command and you can use the @kbd{M-x Info-validate} command.@refill
@menu
* Debugging with Info:: How to catch errors with Info formatting.
* Debugging with TeX:: How to catch errors with @TeX{} formatting.
* Using texinfo-show-structure:: How to use @code{texinfo-show-structure}.
-@@ -17055,7 +17055,7 @@
+@@ -17072,7 +17072,7 @@
* Running Info-Validate:: How to find badly referenced nodes.
@end menu
@ifinfo
@heading @code{makeinfo} Find Errors
@end ifinfo
-@@ -17074,7 +17074,7 @@
+@@ -17091,7 +17091,7 @@
cannot use @code{makeinfo}, or your problem is very puzzling, then you
may want to use the tools described in this appendix.@refill
@comment node-name, next, previous, up
@section Catching Errors with Info Formatting
@cindex Catching errors with Info formatting
-diff -Nru texinfo-4.0/doc/info-stnd.texi texinfo-4.0.new/doc/info-stnd.texi
---- texinfo-4.0/doc/info-stnd.texi Fri Jun 25 23:57:05 1999
-+++ texinfo-4.0.new/doc/info-stnd.texi Fri Oct 1 12:51:32 1999
-@@ -10,9 +10,9 @@
-
- @include version.texi
-
--@dircategory Texinfo documentation system
-+@dircategory Texinfo documentation system:
- @direntry
--* Standalone info program: (info-stnd). Standalone Info-reading program.
-+* Standalone info program: (info-stnd). Standalone Info-reading program
- @end direntry
-
- @ifinfo
-diff -Nru texinfo-4.0/doc/info.texi texinfo-4.0.new/doc/info.texi
---- texinfo-4.0/doc/info.texi Mon Apr 19 23:37:23 1999
-+++ texinfo-4.0.new/doc/info.texi Fri Oct 1 13:06:51 1999
-@@ -5,9 +5,9 @@
- @comment %**end of header
- @comment $Id$
-
--@dircategory Texinfo documentation system
-+@dircategory Texinfo documentation system:
- @direntry
--* Info: (info). Documentation browsing system.
-+* Info: (info). Documentation browsing system
- @end direntry
-
- @ifinfo