-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
-@@ -22,13 +22,13 @@
+--- texinfo-4.7/doc/info-stnd.texi.orig 2004-03-24 02:41:06.000000000 +0100
++++ texinfo-4.7/doc/info-stnd.texi 2004-04-12 13:07:58.150558008 +0200
+@@ -35,10 +35,10 @@
+ @end quotation
+ @end copying
+
+-@dircategory Texinfo documentation system
++@dircategory Texinfo documentation system:
+ @direntry
+-* info standalone: (info-stnd). Read Info documents without Emacs.
+-* infokey: (info-stnd)Invoking infokey. Compile Info customizations.
++* info standalone: (info-stnd). Read Info documents without Emacs
++* infokey: (info-stnd)infokey. Compile Info customizations
+ @end direntry
+
+ @titlepage
+@@ -1963,12 +1963,12 @@
+ textual source file using the @code{infokey} command.
+
+ @menu
+-* Invoking infokey::
++* infokey::
+ * infokey source format::
+ @end menu
- @comment %**end of header
+
+-@node Invoking infokey
++@node infokey
+ @section Invoking @command{infokey}
+
+ @cindex invoking infokey
+--- texinfo-4.7/doc/info.texi.orig 2004-04-06 10:21:35.000000000 +0200
++++ texinfo-4.7/doc/info.texi 2004-04-12 13:08:41.859913176 +0200
+@@ -37,9 +37,9 @@
+ @end quotation
+ @end copying
+
+-@dircategory Texinfo documentation system
++@dircategory Texinfo documentation system:
+ @direntry
+-* Info: (info). How to use the documentation browsing system.
++* Info: (info). The documentation browsing system
+ @end direntry
+
+ @titlepage
+--- texinfo-4.8/doc/texinfo.txi.orig 2004-12-29 16:06:41.000000000 +0100
++++ texinfo-4.8/doc/texinfo.txi 2005-01-08 00:19:43.541783216 +0100
+@@ -54,14 +54,14 @@
+ @end quotation
+ @end copying
-@dircategory Texinfo documentation system
+@dircategory Texinfo documentation system:
-* Texinfo: (texinfo). The GNU documentation format.
-* install-info: (texinfo)Invoking install-info. Update info/dir entries.
-* texi2dvi: (texinfo)Format with texi2dvi. Print Texinfo documents.
+-* texi2pdf: (texinfo)PDF Output. PDF output for Texinfo.
-* texindex: (texinfo)Format with tex/texindex. Sort Texinfo index files.
--* makeinfo: (texinfo)makeinfo Preferred. Translate Texinfo source.
-+* Texinfo: (texinfo) The GNU documentation format
-+* install-info: (texinfo)install-info Update info/dir entries
-+* texi2dvi: (texinfo)texi2dvi Print Texinfo documents
-+* texindex: (texinfo)texindex Sort Texinfo index files
-+* makeinfo: (texinfo)makeinfo 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
++* texi2pdf: (texinfo)texi2pdf. PDF output for Texinfo
++* texindex: (texinfo)texindex. Sort Texinfo index files
++* makeinfo: (texinfo)makeinfo. Translate Texinfo source
@end direntry
@c Before release, run C-u C-c C-u C-a (texinfo-all-menus-update with a
-@@ -538,8 +538,8 @@
+@@ -556,8 +556,8 @@
Formatting and Printing Hardcopy
* Use TeX:: Use @TeX{} to format for hardcopy.
-* Format with tex/texindex:: How to format with explicit shell commands.
-* Format with texi2dvi:: A simpler way to format.
-+* texindex:: How to format with explicit shell commands.
-+* texi2dvi:: A simpler way to format.
++* texindex:: How to format with explicit shell commands.
++* texi2dvi:: A simpler way to format.
* 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 @@
- located in other directories.
+@@ -570,7 +570,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.
+-* PDF Output:: Portable Document Format output.
++* texi2pdf:: Portable Document Format output.
+ * Obtaining TeX:: How to Obtain @TeX{}.
+
+ Creating and Installing Info Files
+@@ -581,7 +581,7 @@
+ Creating an Info File
+
+ * makeinfo advantages:: @code{makeinfo} provides better error checking.
+-* Invoking makeinfo:: How to run @code{makeinfo} from a shell.
++* makeinfo:: How to run @code{makeinfo} from a shell.
+ * 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.
+@@ -600,7 +600,7 @@
+ located in other directories.
* Installing Dir Entries:: How to specify what menu entry to add
- to the Info directory.
+ to the Info directory.
-* Invoking install-info:: @code{install-info} options.
-+* install-info:: @code{install-info} options.
-
- Sample Permissions
++* install-info:: @code{install-info} options.
-@@ -610,7 +610,7 @@
+ Generating HTML
- Formatting Mistakes
+@@ -906,7 +906,7 @@
+ viewable, among other design goals; for a discussion, see
+ @uref{http://tug.org/TUGboat/Articles/tb22-3/tb72beebeI.pdf}. Texinfo
+ uses the @command{pdftex} program, a variant of @TeX{}, to output PDF;
+-see @uref{http://tug.org/applications/pdftex}. @xref{PDF Output}.
++see @uref{http://tug.org/applications/pdftex}. @xref{texi2pdf}.
--* makeinfo Preferred:: @code{makeinfo} finds errors.
-+* makeinfo:: @code{makeinfo} finds errors.
- * 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 @@
+ @item XML
+ @cindex XML output
+@@ -2438,7 +2438,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 @@
+@@ -3645,8 +3645,8 @@
You need to include the @code{@@set@dots{}contentsaftertitlepage}
commands early in the document (just after @code{@@setfilename}, for
--example). Or, if you're using @command{texi2dvi} (@pxref{Format with
--texi2dvi}), you can use its @option{--texinfo} option to specify this
-+example). Or, if you're using @command{texi2dvi} (@pxref{texi2dvi}),
-+you can use its @option{--texinfo} option to specify this
- without altering the source file at all. For example:
+-example). We recommend using @command{texi2dvi} (@pxref{Format with
+-texi2dvi}) to specify this without altering the source file at all. For
++example). We recommend using @command{texi2dvi} (@pxref{texi2dvi})
++to specify this without altering the source file at all. For
+ example:
@example
- texi2dvi --texinfo=@@setshortcontentsaftertitlepage foo.texi
-@@ -12629,8 +12629,8 @@
+ texi2dvi --texinfo=@@setcontentsaftertitlepage foo.texi
+@@ -13637,7 +13637,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}
+-option (@pxref{Format with texi2dvi}).
++option (@pxref{texi2dvi}).
+
+ @itemize @bullet
+ @item
+@@ -13906,8 +13906,8 @@
@menu
* Use TeX:: Use @TeX{} to format for hardcopy.
-* Format with tex/texindex:: How to format with explicit shell commands.
-* Format with texi2dvi:: A simpler way to format.
-+* texindex:: How to format with explicit shell commands.
-+* texi2dvi:: A simpler way to format.
++* texindex:: How to format with explicit shell commands.
++* texi2dvi:: A simpler way to format.
* 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 @@
- make an Info file (@pxref{Creating an Info File}).
+@@ -13920,7 +13920,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.
+-* PDF Output:: Portable Document Format output.
++* texi2pdf:: Portable Document Format output.
+ * Obtaining TeX:: How to Obtain @TeX{}.
+ @end menu
+
+@@ -13939,7 +13939,7 @@
+ File}).
-@node Format with tex/texindex
@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 @@
- @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}
--command automatically generates indices; @pxref{Format with texi2dvi,,
-+command automatically generates indices; @pxref{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 @@
+@@ -14036,7 +14036,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 @@
+@@ -14068,7 +14068,7 @@
(@pxref{Pointer Validation}).
@section Format with @code{texi2dvi}
@pindex texi2dvi @r{(shell script)}
-@@ -12823,7 +12823,7 @@
- For a list of other options, run @samp{texi2dvi --help}.
-
+@@ -14103,7 +14103,7 @@
+ @pxref{Preparing for TeX,,Preparing for @TeX{}}).
--@node Print with lpr, Within Emacs, Format with texi2dvi, Hardcopy
-+@node Print with lpr, Within Emacs, texi2dvi, Hardcopy
- @section Shell Print Using @code{lpr -d}
- @pindex lpr @r{(DVI print command)}
+ With the @option{--pdf} option, @command{texi2dvi} produces PDF output
+-instead of DVI (@pxref{PDF Output}), by running @command{pdftex}
++instead of DVI (@pxref{texi2pdf}), by running @command{pdftex}
+ instead of @command{tex}. Alternatively, the command
+ @command{texi2pdf} is an abbreviation for running @samp{texi2dvi --pdf}.
-@@ -13331,7 +13331,7 @@
+@@ -14631,7 +14631,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 @@
+@@ -14661,7 +14661,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 @@
+@@ -14707,7 +14707,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 @@
- located in other directories.
+@@ -14776,7 +14776,7 @@
+ magnifications. Be prepared to experiment.
+
+
+-@node PDF Output
++@node texi2pdf
+ @section PDF Output
+ @cindex PDF output
+
+@@ -14784,7 +14784,7 @@
+ The simplest way to generate PDF output from Texinfo source is to run
+ the convenience script @command{texi2pdf}; this simply executes the
+ @command{texi2dvi} script with the @option{--pdf} option
+-(@pxref{Format with texi2dvi}). If for some reason you want to
++(@pxref{texi2dvi}). If for some reason you want to
+ process 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}.
+@@ -14888,7 +14888,7 @@
+
+ @menu
+ * makeinfo advantages:: @code{makeinfo} provides better error checking.
+-* Invoking makeinfo:: How to run @code{makeinfo} from a shell.
++* makeinfo:: How to run @code{makeinfo} from a shell.
+ * 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.
+@@ -14920,7 +14920,7 @@
+ @code{makeinfo}.
+
+
+-@node Invoking makeinfo
++@node makeinfo
+ @subsection Running @code{makeinfo} from a Shell
+ @pindex makeinfo
+
+@@ -15620,7 +15620,7 @@
+ located in other directories.
* Installing Dir Entries:: How to specify what menu entry to add
- to the Info directory.
+ to the Info directory.
-* Invoking install-info:: @code{install-info} options.
-+* install-info:: @code{install-info} options.
++* install-info:: @code{install-info} options.
@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 @@
- @@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
-@@ -14479,7 +14479,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
-@@ -14505,8 +14505,8 @@
- entry for the manual as a whole in the appropriate other category.
+@@ -15926,7 +15926,7 @@
+ traditional @command{man} system.
-@node Invoking install-info
--@subsection Invoking install-info
+@node install-info
-+@subsection install-info
-
+ @subsection Invoking @command{install-info}
@pindex install-info
-@@ -17047,7 +17047,7 @@
- command and you can use the @kbd{M-x Info-validate} command.@refill
+@@ -16442,7 +16442,7 @@
- @menu
--* makeinfo Preferred:: @code{makeinfo} finds errors.
-+* makeinfo:: @code{makeinfo} finds errors.
- * 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 @@
- * Running Info-Validate:: How to find badly referenced nodes.
- @end menu
-
--@node makeinfo Preferred, Debugging with Info, Catching Mistakes, Catching Mistakes
-+@node makeinfo, Debugging with Info, Catching Mistakes, Catching Mistakes
- @ifinfo
- @heading @code{makeinfo} Find Errors
- @end ifinfo
-@@ -17074,7 +17074,7 @@
- cannot use @code{makeinfo}, or your problem is very puzzling, then you
- may want to use the tools described in this appendix.@refill
-
--@node Debugging with Info, Debugging with TeX, makeinfo Preferred, Catching Mistakes
-+@node Debugging with Info, Debugging with TeX, makeinfo, Catching Mistakes
- @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
+ In standard Texinfo, node names may not contain @@-commands.
+ @command{makeinfo} has an option @option{--commands-in-node-names}
+-which partially supports it (@pxref{Invoking makeinfo}), but it is not
++which partially supports it (@pxref{makeinfo}), but it is not
+ robust and not recommended.
- @ifinfo
+ Thus, @command{makeinfo} also does not fully implement this part of
projects / packages / texinfo.git / blobdiff