@end direntry
@titlepage
---- texinfo-4.11/doc/texinfo.txi.orig 2007-07-29 16:55:43.000000000 +0200
-+++ texinfo-4.11/doc/texinfo.txi 2007-11-01 01:47:07.995421306 +0100
+--- texinfo-4.12/doc/texinfo.txi.orig 2008-04-09 19:07:31.000000000 +0200
++++ texinfo-4.12/doc/texinfo.txi 2008-05-29 23:44:49.056866313 +0200
@@ -56,15 +56,15 @@
@end quotation
@end copying
@end direntry
@c Before release, run C-u C-c C-u C-a (texinfo-all-menus-update with a
-@@ -566,8 +566,8 @@
+@@ -568,8 +568,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.
-@@ -580,7 +580,7 @@
+@@ -582,7 +582,7 @@
* pagesizes:: How to print with customized page sizes.
* Cropmarks and Magnification:: How to print marks to indicate the size
of pages and how to print scaled up output.
* Obtaining TeX:: How to Obtain @TeX{}.
Creating and Installing Info Files
-@@ -591,7 +591,7 @@
+@@ -593,7 +593,7 @@
Creating an Info File
* makeinfo advantages:: @code{makeinfo} provides better error checking.
* makeinfo options:: Specify fill-column and other options.
* Pointer Validation:: How to check that pointers point somewhere.
* makeinfo in Emacs:: How to run @code{makeinfo} from Emacs.
-@@ -610,7 +610,7 @@
+@@ -612,7 +612,7 @@
located in other directories.
* Installing Dir Entries:: How to specify what menu entry to add
to the Info directory.
Generating HTML
-@@ -905,7 +905,7 @@
+@@ -907,7 +907,7 @@
@uref{http://tug.org/TUGboat/Articles/tb22-3/tb72beebe-pdf.pdf} has
some background. Texinfo uses the @command{pdftex} program, a variant
of @TeX{}, to output PDF; see
@item XML
@cindex XML output
-@@ -2415,7 +2415,7 @@
+@@ -2416,7 +2416,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
-@@ -3616,8 +3616,8 @@
+@@ -3612,8 +3612,8 @@
You need to include the @code{@@set@dots{}contentsaftertitlepage}
commands early in the document (just after @code{@@setfilename}, for
example:
@example
texi2dvi --texinfo=@@setcontentsaftertitlepage foo.texi
-@@ -13968,7 +13968,7 @@
+@@ -14062,7 +14062,7 @@
problems with @TeX{}. If you get macro-related errors when producing
the printed version of a manual, try expanding the macros with
@command{makeinfo} by invoking @command{texi2dvi} with the @samp{-E}
@itemize @bullet
@item
-@@ -14237,8 +14237,8 @@
+@@ -14331,8 +14331,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.
-@@ -14251,7 +14251,7 @@
+@@ -14345,7 +14345,7 @@
* pagesizes:: How to print with customized page sizes.
* Cropmarks and Magnification:: How to print marks to indicate the size
of pages and how to print scaled up output.
* Obtaining TeX:: How to Obtain @TeX{}.
@end menu
-@@ -14270,7 +14270,7 @@
+@@ -14364,7 +14364,7 @@
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}
-@@ -14367,7 +14367,7 @@
+@@ -14461,7 +14461,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
-@@ -14399,7 +14399,7 @@
+@@ -14493,7 +14493,7 @@
(@pxref{Pointer Validation}).
@section Format with @code{texi2dvi}
@pindex texi2dvi @r{(shell script)}
-@@ -14436,7 +14436,7 @@
+@@ -14530,7 +14530,7 @@
@opindex --pdf @r{(@command{texi2dvi})}
With the @option{--pdf} option, @command{texi2dvi} produces PDF output
instead of @command{tex}. Alternatively, the command
@command{texi2pdf} is an abbreviation for running @samp{texi2dvi
--pdf}. The command @command{pdftexi2dvi} is also supported as a
-@@ -15013,7 +15013,7 @@
+@@ -15107,7 +15107,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.
-@@ -15043,7 +15043,7 @@
+@@ -15137,7 +15137,7 @@
@end group
@end example
@TeX{}}, for other ways to format for different paper sizes that do not
require changing the source file.
-@@ -15089,7 +15089,7 @@
+@@ -15183,7 +15183,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.
-@@ -15158,7 +15158,7 @@
+@@ -15252,7 +15252,7 @@
magnifications. Be prepared to experiment.
@section PDF Output
@cindex PDF output
-@@ -15166,7 +15166,7 @@
+@@ -15260,7 +15260,7 @@
The simplest way to generate PDF output from Texinfo source is to run
the convenience script @command{texi2pdf} (or @command{pdftexi2dvi});
this simply executes the @command{texi2dvi} script with the
reason you want to process the document by hand, simply run the
@command{pdftex} program instead of plain @command{tex}. That is, run
@samp{pdftex foo.texi} instead of @samp{tex foo.texi}.
-@@ -15270,7 +15270,7 @@
+@@ -15364,7 +15364,7 @@
@menu
* makeinfo advantages:: @code{makeinfo} provides better error checking.
* makeinfo options:: Specify fill-column and other options.
* Pointer Validation:: How to check that pointers point somewhere.
* makeinfo in Emacs:: How to run @code{makeinfo} from Emacs.
-@@ -15302,7 +15302,7 @@
+@@ -15396,7 +15396,7 @@
@code{makeinfo}.
@subsection Running @code{makeinfo} from a Shell
@pindex makeinfo
-@@ -16019,7 +16019,7 @@
+@@ -16111,7 +16111,7 @@
located in other directories.
* Installing Dir Entries:: How to specify what menu entry to add
to the Info directory.
@end menu
-@@ -16330,7 +16330,7 @@
+@@ -16359,7 +16359,7 @@
+ @@dircategory Texinfo documentation system
+ @@direntry
+ * Texinfo: (texinfo). The GNU documentation format.
+-* install-info: (texinfo)Invoking install-info. @dots{}
++* install-info: (texinfo)install-info. @dots{}
+ @dots{}
+ @@end direntry
+ @end smallexample
+@@ -16370,7 +16370,7 @@
+ INFO-DIR-SECTION Texinfo documentation system
+ START-INFO-DIR-ENTRY
+ * Texinfo: (texinfo). The GNU documentation format.
+-* install-info: (texinfo)Invoking install-info. @dots{}
++* install-info: (texinfo)install-info. @dots{}
+ @dots{}
+ END-INFO-DIR-ENTRY
+ @end smallexample
+@@ -16392,7 +16392,7 @@
+ most others. Description for individual utilities best start in
+ column 48, where possible. For more information about formatting see
+ the @samp{--calign}, @samp{--align}, and @samp{--max-width} options in
+-@ref{Invoking install-info}.
++@ref{install-info}.
+
+ If you use @code{@@dircategory} more than once in the Texinfo source,
+ each usage specifies the `current' category; any subsequent
+@@ -16427,7 +16427,7 @@
traditional @command{man} system.
@subsection Invoking @command{install-info}
@pindex install-info
-@@ -16862,7 +16862,7 @@
+@@ -17050,7 +17050,7 @@
In standard Texinfo, node names may not contain @@-commands.
@command{makeinfo} has an option @option{--commands-in-node-names}