texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo ChangeLog doc/texinfo.txi


From: karl
Subject: texinfo ChangeLog doc/texinfo.txi
Date: Sat, 25 Aug 2012 23:34:05 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     12/08/25 23:34:05

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        (Conditionals, Defining New Texinfo Commands, Include Files, Hardcopy): 
general updates

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1395&r2=1.1396
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.461&r2=1.462

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1395
retrieving revision 1.1396
diff -u -b -r1.1395 -r1.1396
--- ChangeLog   24 Aug 2012 18:17:47 -0000      1.1395
+++ ChangeLog   25 Aug 2012 23:34:04 -0000      1.1396
@@ -1,4 +1,10 @@
-2012-08-23  Patrice Dumas  <address@hidden>
+2012-08-25  Patrice Dumas  <address@hidden>
+        and Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Conditionals, Defining New Texinfo Commands,
+       Include Files, Hardcopy): general updates throughout the chapters.
+
+2012-08-24  Patrice Dumas  <address@hidden>
         and Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (Generic Translator texi2any): general

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -b -r1.461 -r1.462
--- doc/texinfo.txi     24 Aug 2012 18:17:47 -0000      1.461
+++ doc/texinfo.txi     25 Aug 2012 23:34:04 -0000      1.462
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.461 2012/08/24 18:17:47 karl Exp $
address@hidden $Id: texinfo.txi,v 1.462 2012/08/25 23:34:04 karl Exp $
 @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
 @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
 
@@ -1416,10 +1416,10 @@
 
 By convention, the name of a Texinfo file ends with (in order of
 preference) one of the extensions @file{.texinfo}, @file{.texi},
address@hidden, or @file{.tex}.  The longer extensions are preferred since
-they describe more clearly to a human reader the nature of the file.
-The shorter extensions are for operating systems that cannot handle long
-file names.
address@hidden, or @file{.tex}.  The longer extensions are preferred
+since they describe more clearly to a human reader the nature of the
+file.  The shorter extensions are for operating systems that cannot
+handle long file names.
 
 In order to be made into a good printed manual and other output
 formats, a Texinfo file @emph{must} begin with lines like this:
@@ -10396,6 +10396,13 @@
 source indices you use, since then readers have only one place to
 look.
 
+When creating an index, @TeX{} creates a file whose extension is the
+name of the index (@pxref{Names of index files}).  Therefore you
+should avoid using index names that collide with extensions used for
+other purposes, such as @samp{.aux} or @samp{.xml}.
address@hidden already reports an error if a new index conflicts
+well-known extension name.
+
 
 @node Insertions
 @chapter Special Insertions
@@ -13880,18 +13887,11 @@
 @cindex Plain @TeX{}
 
 Ordinarily, the @code{@@address@hidden conditionals just described must be
-used only with normal Texinfo source.  However, for historical reasons
-there is an exception for @code{@@iftex}---you can embed a few raw
address@hidden commands, just changing @samp{\} to @samp{@@}.  For example, in
-the @code{@@titlepage} section of a Texinfo file, you can use the
address@hidden command @code{@@vskip} to format the copyright page.  (The
address@hidden@@titlepage} command causes Info to ignore the region
-automatically, as it does with the @code{@@iftex} command.)
-
-However, most features of plain @TeX{} will not work within
address@hidden@@iftex}, as they are overridden by Texinfo features.  The
-purpose of @code{@@iftex} is to provide conditional processing for the
-Texinfo source, not provide access to underlying formatting features.
+used only with normal Texinfo source.  For instance, most features of
+plain @TeX{} will not work within @code{@@iftex}, as they are
+overridden by Texinfo features.  The purpose of @code{@@iftex} is to
+provide conditional processing for the Texinfo source, not provide
+access to underlying formatting features.
 
 @findex tex
 @cindex Category codes, of plain @TeX{}
@@ -13900,9 +13900,8 @@
 @code{@@end tex} commands.  All plain @TeX{} commands and category
 codes are restored within an @code{@@tex} region.  The sole exception
 is that the @code{@@} character still introduces a command, so that
address@hidden@@end tex} can be recognized.  As with @code{@@iftex}, Texinfo
-processors will ignore such a region unless @TeX{} output is being
-produced.
address@hidden@@end tex} can be recognized.  Texinfo processors will ignore
+such a region in their output unless @TeX{} output is being produced.
 
 @findex \gdef @r{within @code{@@tex}}
 @findex \globaldefs @r{within @code{@@tex}}
@@ -13928,12 +13927,8 @@
 
 @noindent
 The output of this example will appear only in a printed manual.  If
-you are reading this in Info, you will not see the equation that appears
-in the printed manual.
address@hidden
-In a printed manual, the above expression looks like
-this:
address@hidden iftex
+you are reading this in a format not generated by @TeX{}, you will not
+see the equation that appears in the printed manual.
 
 @tex
 $$ \chi^2 = \sum_{i=1}^N
@@ -13953,7 +13948,29 @@
 @findex xml
 Likewise, you can use @code{@@ifxml @dots{} @@end ifxml} to delimit
 Texinfo source to be included in XML output only, and @code{@@xml
address@hidden @@end xml} for a region of raw XML.
address@hidden @@end xml} for a region of raw XML.  Regions of raw text in
+other formats will also be present in the XML output, but with
+protection of XML characters and within corresponding elements.  For
+example:
+
address@hidden
address@hidden
+@@html
+<br />
+@@end html
address@hidden group
address@hidden example
+
address@hidden
+will be output in XML as
+
address@hidden
address@hidden
+<html>
+&lt;br /&gt;
+</html>
address@hidden group
address@hidden example
 
 @cindex Docbook, including raw
 @findex ifdocbook
@@ -14446,14 +14463,10 @@
 foo}).
 
 @cindex Body of a macro
address@hidden Mutually recursive macros
address@hidden Recursion, mutual
 The definition or @dfn{body} of the macro can contain most Texinfo
-commands, including previously-defined macros.  Not-yet-defined macro
-invocations are not allowed; thus, it is not possible to have mutually
-recursive Texinfo macros.  Also, a macro definition that defines another
-macro does not work in @TeX{} due to limitations in the design of
address@hidden@@macro}.
+commands, including macro invocations.  However, a macro definition
+that defines another macro does not work in @TeX{} due to limitations
+in the design of @code{@@macro}.
 
 @cindex Parameters to macros
 In the macro body, instances of a parameter name surrounded by
@@ -14718,11 +14731,14 @@
 @noindent @TeX{} may or may not do some expansion in these situations,
 possibly yielding errors.
 
-Also, due to unavoidable limitations, certain macro-related constructs
-cause problems with @TeX{}.  If you get macro-related errors when
-producing the printed version of a manual, you might try expanding the
-macros with @command{makeinfo} by invoking @command{texi2dvi} with the
address@hidden option (@pxref{Format with texi2dvi}).
+Also, due to unavoidable limitations, quite a few macro-related
+constructs cause problems with @TeX{}, as follows.  If you get
+macro-related errors when producing the printed version of a manual,
+you might try expanding the macros with @command{makeinfo} by invoking
address@hidden with the @samp{-E} option (@pxref{Format with
+texi2dvi}).  Or eschew Texinfo macros altogether and use a language
+designed for macro processing, such as M4 (@pxref{External Macro
+Processors}).
 
 @itemize @bullet
 @item
@@ -14825,14 +14841,15 @@
 
 @end itemize
 
-The @command{makeinfo} implementation also has limitations:
+The @command{makeinfo} implementation also has the following
+limitations (by design):
 
 @itemize
 @item
 @code{@@verbatim} and macros do not mix; for instance, you can't start
-a verbatim block inside a macro and end it outside.
-(@xref{verbatim}.)  Starting any environment inside a macro and ending
-it outside may or may not work, for that matter.
+a verbatim block inside a macro and end it outside (@pxref{verbatim}).
+Starting any environment inside a macro and ending it outside may or
+may not work, for that matter.
 
 @item
 Macros that completely define macros are ok, but it's not possible to
@@ -14841,17 +14858,11 @@
 correctly paired.  For example, you cannot start a macro definition
 within a macro, and then end the nested definition outside the macro.
 
address@hidden
address@hidden@@rmacro} is a kludge.
-
 @end itemize
 
 One more limitation is common to both implementations: white space is
 ignored at the beginnings of lines.
 
-Future major revisions of Texinfo may ease some of these limitations
-(by introducing a new macro syntax).
-
 
 @node alias
 @section @samp{@@alias @address@hidden
@@ -14909,35 +14920,36 @@
 @findex definfoenclose
 
 An @code{@@definfoenclose} command may be used to define a
-highlighting command for Info, but not for @TeX{}.  A command defined
-using @code{@@definfoenclose} marks text by enclosing it in strings
-that precede and follow the text.  You can use this to get closer
-control of your Info output.
-
-Presumably, if you define a command with @code{@@definfoenclose} for Info,
-you will create a corresponding command for @TeX{}, either in
address@hidden, @file{texinfo.cnf}, or within an @samp{@@iftex} in
-your document.
+highlighting command for all the address@hidden output formats.  A command
+defined using @code{@@definfoenclose} marks text by enclosing it in
+strings that precede and follow the text.  You can use this to get
+closer control of your output.
+
+Presumably, if you define a command with @code{@@definfoenclose}, you
+will create a corresponding command for @TeX{}, either in
address@hidden, @file{texinfo.cnf}, or within an @samp{@@iftex} of
address@hidden@@tex} in your document.
 
 Write an @code{@@definfoenclose} command on a line and follow it with
 three arguments separated by commas.  The first argument to
 @code{@@definfoenclose} is the @@-command name (without the
 @code{@@}); the second argument is the Info start delimiter string;
 and the third argument is the Info end delimiter string.  The latter
-two arguments enclose the highlighted text in the Info file.  A
-delimiter string may contain spaces.  Neither the start nor end
+two arguments enclose the highlighted text in the Info file.
+
+A delimiter string may contain spaces.  Neither the start nor end
 delimiter is required.  If you do not want a start delimiter but do
 want an end delimiter, you must follow the command name with two
-commas in a row; otherwise, the Info formatting commands will
-naturally misinterpret the end delimiter string you intended as the
-start delimiter string.
-
-If you do an @code{@@definfoenclose} on the name of a predefined macro
-(such as @code{@@emph}, @code{@@strong}, @code{@@t}, or @code{@@i}),
-the enclosure definition will override the built-in definition.
+commas in a row; otherwise, the end delimiter string you intended will
+naturally be (mis)interpreted as the start delimiter string.
+
+If you do an @code{@@definfoenclose} on the name of a predefined
+command (such as @code{@@emph}, @code{@@strong}, @code{@@t}, or
address@hidden@@i}), the enclosure definition will override the built-in
+definition.  We don't recommend this.
 
-An enclosure command defined this way takes one argument in braces; this
-is intended for new markup commands (@pxref{Marking Text}).
+An enclosure command defined this way takes one argument in braces,
+since it is intended for new markup commands (@pxref{Marking Text}).
 
 @findex phoo
 For example, you can write:
@@ -14952,7 +14964,7 @@
 to @code{@@phoo}.  You can then write @code{@@address@hidden@}} wherever you
 want `//bar\\' highlighted in Info.
 
-Also, for @TeX{} formatting, you could write
+For @TeX{} formatting, you could write
 
 @example
 @@iftex
@@ -14964,10 +14976,11 @@
 to define @code{@@phoo} as a command that causes @TeX{} to typeset the
 argument to @code{@@phoo} in italics.
 
-Each definition applies to its own formatter: one for @TeX{}, the other
-for @code{texinfo-format-buffer} or @code{texinfo-format-region}.  The
address@hidden@@definfoenclose} command need not be within @samp{@@ifinfo}, but
-the raw @TeX{} commands do need to be in @samp{@@iftex}.
+Each definition applies to its own formatter: one for @TeX{}, the
+other for everything else.  The raw @TeX{} commands need to be in
address@hidden@@iftex}.  @code{@@definfoenclose} command need not be within
address@hidden@@ifinfo}, unless you want to use different definitions for
+different output formats.
 
 @findex headword
 Here is another example: write
@@ -15154,14 +15167,11 @@
 @chapter Include Files
 @cindex Include files
 
-When @TeX{} or an Info formatting command sees an @code{@@include}
-command in a Texinfo file, it processes the contents of the file named
-by the command and incorporates them into the DVI or Info file being
-created.  Index entries from the included file are incorporated into
-the indices of the output file.
-
-Include files let you keep a single large document as a collection of
-conveniently small parts.
+When a Texinfo processor sees an @code{@@include} command in a Texinfo
+file, it processes the contents of the file named by the
address@hidden@@include} and incorporates them into the output files being
+created.  Include files thus let you keep a single large document as a
+collection of conveniently small parts.
 
 @menu
 * Using Include Files::         How to use the @code{@@include} command.
@@ -15174,6 +15184,7 @@
                                      has changed over time.
 @end menu
 
+
 @node Using Include Files
 @section How to Use Include Files
 @findex include
@@ -15186,59 +15197,36 @@
 @@include buffers.texi
 @end example
 
-The name of the file is taken literally, with the exception that
address@hidden@@address@hidden@address@hidden references are expanded.  This 
makes it
-possible to reliably include files in other directories in a
-distribution.  @xref{verbatiminclude,,@code{@@verbatiminclude}}, for
-an example.
+@@-commands are expanded in file names.  The one most likely to be
+useful is @code{@@value} (@pxref{set value}), and even then only in
+complicated situations.
 
 An included file should simply be a segment of text that you expect to
 be included as is into the overall or @dfn{outer} Texinfo file; it
 should not contain the standard beginning and end parts of a Texinfo
 file.  In particular, you should not start an included file with a
-line saying @samp{\input texinfo}; if you do, that phrase is inserted
-into the output file as is.  Likewise, you should not end an included
-file with an @code{@@bye} command; nothing after @code{@@bye} is
-formatted.
-
-In the past, you were required to write an @code{@@setfilename} line at the
-beginning of an included file, but no longer.  Now, it does not matter
-whether you write such a line.  If an @code{@@setfilename} line exists
-in an included file, it is ignored.
-
-Conventionally, an included file begins with an @code{@@node} line that
-is followed by an @code{@@chapter} line.  Each included file is one
-chapter.  This makes it easy to use the regular node and menu creating
-and updating commands to create the node pointers and menus within the
-included file.  However, the simple Emacs node and menu creating and
-updating commands do not work with multiple Texinfo files.  Thus you
-cannot use these commands to fill in the `Next', `Previous', and `Up'
-pointers of the @code{@@node} line that begins the included file.  Also,
-you cannot use the regular commands to create a master menu for the
-whole file.  Either you must insert the menus and the `Next',
-`Previous', and `Up' pointers by hand, or you must use the GNU Emacs
-Texinfo mode command, @code{texinfo-multiple-files-update}, that is
-designed for @code{@@include} files.
-
-When an included file does not have any node lines in it, the
-multiple files update command does not try to create a menu entry
-for it.  Consequently, you can include any file, such as a
-version or an update file without node lines, not just files that
-are chapters.  Small includable files like this are created by
-Automake (@pxref{GNU Sample Texts}).
+line saying @samp{\input texinfo}; if you do, that text is inserted
+into the output file literally.  Likewise, you should not end an
+included file with an @code{@@bye} command; nothing after @code{@@bye}
+is formatted.
+
+In the long-ago past, you were required to write an
address@hidden@@setfilename} line at the beginning of an included file, but no
+longer.  Now, it does not matter whether you write such a line.  If an
address@hidden@@setfilename} line exists in an included file, it is ignored.
 
 
 @node texinfo-multiple-files-update
 @section @code{texinfo-multiple-files-update}
 @findex texinfo-multiple-files-update
 
-GNU Emacs Texinfo mode provides the @code{texinfo-multiple-files-update}
-command.  This command creates or updates `Next', `Previous', and `Up'
-pointers of included files as well as those in the outer or overall
-Texinfo file, and it creates or updates a main menu in the outer file.
-Depending whether you call it with optional arguments, the command
-updates only the pointers in the first @code{@@node} line of the
-included files or all of them:
+GNU Emacs Texinfo mode provides the
address@hidden command.  This command creates or
+updates `Next', `Previous', and `Up' pointers of included files as
+well as those in the outer or overall Texinfo file, and it creates or
+updates a main menu in the outer file.  Depending on whether you call
+it with optional arguments, the command updates only the pointers in
+the first @code{@@node} line of the included files or all of them:
 
 @table @kbd
 @item M-x texinfo-multiple-files-update
@@ -15447,12 +15435,16 @@
 @cindex Indices, sorting
 @cindex @TeX{} index sorting
 
-There are three major shell commands for making a printed manual from a
-Texinfo file: one for converting the Texinfo file into a file that will be
-printed, a second for sorting indices, and a third for printing the
-formatted document.  When you use the shell commands, you can either
-work directly in the operating system shell or work within a shell
-inside GNU Emacs (or some other computing environment).
+Running the @command{texi2dvi} or @command{texi2pdf} command is the
+simplest way to create printable output.  These commands are installed
+as part of the Texinfo package.
+
+More specifically, three major shell commands for making a printed
+manual from a Texinfo file: one for converting the Texinfo file into a
+file that will be printed, a second for sorting indices, and a third
+for printing the formatted document.  When you use the shell commands,
+you can either work directly in the operating system shell or work
+within a shell inside GNU Emacs (or some other computing environment).
 
 If you are using GNU Emacs, you can use commands provided by Texinfo
 mode instead of shell commands.  In addition to the three commands to
@@ -15460,6 +15452,8 @@
 offers key bindings for commands to recenter the output buffer, show the
 print queue, and delete a job from the print queue.
 
+Details are in the following sections.
+
 @menu
 * Use @TeX{}::                     Use @TeX{} to format for hardcopy.
 * Format with tex/texindex::    How to format with explicit shell commands.
@@ -15484,15 +15478,16 @@
 @section Use @TeX{}
 
 The typesetting program called @TeX{} is used for formatting a Texinfo
-file.  @TeX{} is a very powerful typesetting program and, if used
+file.  @TeX{} is a very powerful typesetting program and, when used
 correctly, does an exceptionally good job.  (@xref{Obtaining @TeX{}},
-for information on how to obtain @TeX{}.)
+for information on how to obtain @TeX{}.  It is not included in the
+Texinfo package, being a vast suite of software itself.)
 
 The standalone @code{makeinfo} program and Emacs functions
 @code{texinfo-format-region} and @code{texinfo-format-buffer} commands
 read the very same @@-commands in the Texinfo file as does @TeX{}, but
-process them differently to make an Info file (@pxref{Creating an Info
-File}).
+process them differently to make Info, HTML, and other output formats
+(@pxref{Generic Translator texi2any}).
 
 
 @node Format with tex/texindex
@@ -15522,16 +15517,17 @@
 Texinfo distribution, among other places.)  (@command{texi2dvi} runs
 @command{tex} and @command{texindex} as necessary.)
 
address@hidden of index files}
 @cindex Names of index files
 @cindex Index file names
-The @code{tex} formatting command outputs unsorted index files under
-names that obey a standard convention: the name of your main input file
-with any @samp{.tex} (or similar, @pxref{tex invocation,,, web2c,
-Web2C}) extension removed, followed by the two letter names of indices.
-For example, the raw index output files for the input file
address@hidden would be @file{foo.cp}, @file{foo.vr}, @file{foo.fn},
address@hidden, @file{foo.pg} and @file{foo.ky}.  Those are exactly the
-arguments to give to @code{texindex}.
address@hidden formatting command outputs unsorted index files under names
+that obey a standard convention: the name of your main input file with
+any @samp{.texinfo} (or similar, @pxref{Minimum,, What a Texinfo File
+Must Have}), followed by the two letter names of indices.  For
+example, the raw index output files for the input file
address@hidden would be @file{foo.cp}, @file{foo.vr},
address@hidden, @file{foo.tp}, @file{foo.pg} and @file{foo.ky}.  Those
+are exactly the arguments to give to @code{texindex}.
 
 @need 1000
 @cindex Wildcards
@@ -15546,11 +15542,11 @@
 
 @noindent
 This command will run @code{texindex} on all the unsorted index files,
-including any that you have defined yourself using @code{@@defindex}
-or @code{@@defcodeindex}.  (You may execute @samp{texindex foo.??}
-even if there are similarly named files with two letter extensions
-that are not index files, such as @samp{foo.el}.  The @code{texindex}
-command reports but otherwise ignores such files.)
+including any two letter indices that you have defined yourself using
address@hidden@@defindex} or @code{@@defcodeindex}.  You can safely run
address@hidden foo.??} even if there are files with two letter
+extensions that are not index files, such as @samp{foo.el}.  The
address@hidden command reports but otherwise ignores such files.
 
 For each file specified, @code{texindex} generates a sorted index file
 whose name is made by appending @samp{s} to the input file name.  The
@@ -16353,39 +16349,38 @@
 @findex cropmarks
 @cindex Cropmarks for printing
 @cindex Printing cropmarks
-You can (attempt to) direct @TeX{} to print cropmarks at the corners of
-pages with the @code{@@cropmarks} command.  Write the @code{@@cropmarks}
-command on a line by itself between @code{@@iftex} and @code{@@end
-iftex} lines near the beginning of the Texinfo file, before the title
-page, like this:
+You can (attempt to) direct @TeX{} to print cropmarks at the corners
+of pages with the @code{@@cropmarks} command.  Write the
address@hidden@@cropmarks} command on a line by itself between @code{@@iftex}
+and @code{@@end iftex} lines near the beginning of the Texinfo file,
+before the title page, like this:
 
 @example
address@hidden
-@@iftex
 @@cropmarks
-@@end iftex
address@hidden group
 @end example
 
 This command is mainly for printers that typeset several pages on one
 sheet of film; but you can attempt to use it to mark the corners of a
 book set to 7 by 9.25 inches with the @code{@@smallbook} command.
 (Printers will not produce cropmarks for regular sized output that is
-printed on regular sized paper.)  Since different printing machines work
-in different ways, you should explore the use of this command with a
-spirit of adventure.  You may have to redefine the command in
+printed on regular sized paper.)  Since different printing machines
+work in different ways, you should explore the use of this command
+with a spirit of adventure.  You may have to redefine the command in
 @file{texinfo.tex}.
 
+The @code{@@cropmarks} command is recognized and ignored in address@hidden
+output formats.
+
 @findex \mag @r{(raw @TeX{} magnification)}
 @cindex Magnified printing
 @cindex Larger or smaller pages
-You can attempt to direct @TeX{} to typeset pages larger or smaller than
-usual with the @code{\mag} @TeX{} command.  Everything that is typeset
-is scaled proportionally larger or smaller.  (@code{\mag} stands for
-``magnification''.)  This is @emph{not} a Texinfo @@-command, but is a
-plain @TeX{} command that is prefixed with a backslash.  You have to
-write this command between @code{@@tex} and @code{@@end tex}
-(@pxref{Raw Formatter Commands}).
+You can attempt to direct @TeX{} to typeset pages larger or smaller
+than usual with the @code{\mag} @TeX{} command.  Everything that is
+typeset is scaled proportionally larger or smaller.  (@code{\mag}
+stands for ``magnification''.)  This is @emph{not} a Texinfo
+@@-command, but is a raw @TeX{} command that is prefixed with a
+backslash.  You have to write this command between @code{@@tex} and
address@hidden@@end tex} (@pxref{Raw Formatter Commands}).
 
 Follow the @code{\mag} command with an @samp{=} and then a number that
 is 1000 times the magnification you desire.  For example, to print pages
@@ -16417,11 +16412,11 @@
 @pindex pdftex
 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
address@hidden option (@pxref{Format with texi2dvi}).  If for some
-reason you want to process the document by hand, simply run the
address@hidden program instead of plain @command{tex}.  That is, run
address@hidden foo.texi} instead of @samp{tex foo.texi}.
+this executes the @command{texi2dvi} script with the @option{--pdf}
+option (@pxref{Format with texi2dvi}).  If for some reason you want to
+process the document by hand, you can run the @command{pdftex} program
+instead of plain @command{tex}.  That is, run @samp{pdftex foo.texi}
+instead of @samp{tex foo.texi}.
 
 @dfn{PDF} stands for `Portable Document Format'. It was invented by
 Adobe Systems some years ago for document interchange, based on their
@@ -16441,10 +16436,10 @@
 
 @end itemize
 
-At present, Texinfo does not provide
address@hidden@@ifpdf} or @samp{@@pdf} commands as for the other output
-formats, since PDF documents contain many internal links that would be
-hard or impossible to get right at the Texinfo source level.
+At present, Texinfo does not provide @samp{@@ifpdf} or @samp{@@pdf}
+commands as for the other output formats, since PDF documents contain
+many internal links that would be hard or impossible to get right at
+the Texinfo source level.
 
 PDF files require special software to be displayed, unlike the plain
 ASCII formats (Info, HTML) that Texinfo supports.  They also tend to
@@ -18914,7 +18909,7 @@
 If @command{makeinfo} is run on a system which does not distinguish
 case in file names, nodes which are the same except for case (e.g.,
 @samp{index} and @samp{Index}) will also be folded into the same
-output file with anchors.  You can also pretend xxxx.
+output file with anchors.  You can also pretend zzzz.
 
 It is also possible to split at chapters or sections with
 @option{--split} (@pxref{Invoking texi2any}).  In that case, the file
@@ -21982,7 +21977,7 @@
 Revision Control System}) or other version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.461 2012/08/24 18:17:47 karl Exp $
+$Id: texinfo.txi,v 1.462 2012/08/25 23:34:04 karl Exp $
 @end example
 (This is useful in all sources that use version control, not just manuals.)
 You may wish to include the @samp{$Id:} comment in the @code{@@copying}



reply via email to

[Prev in Thread] Current Thread [Next in Thread]