xemacs-beta: man/texinfo.texi comparison

comparison man/texinfo.texi @ 430:a5df635868b2 r21-2-23

Import from CVS: tag r21-2-23

author	cvs
date	Mon, 13 Aug 2007 11:29:08 +0200
parents	3ecd8885ac67
children	1ccc32a20af4

comparison

equal deleted inserted replaced

-:8305706cbb93
+:a5df635868b2
 \input texinfo.tex    @c -*-texinfo-*-
-@c $Id: texinfo.texi,v 1.8.2.3 1999/11/17 23:28:29 martinb Exp $
+@c $Id: texinfo.texi,v 1.8.2.4 1999/12/05 19:02:24 martinb Exp $
 @c %**start of header
 @c All text is ignored before the setfilename.
 @setfilename ../info/texinfo.info
+@settitle Texinfo @value{edition}
-@set UPDATED 28 September 1999
-@set EDITION 4.0
+@c Edition number is now the same as the Texinfo distribution version number.
-@set VERSION 4.0
+@set edition 3.12
-@settitle Texinfo @value{VERSION}
+@set update-month February 1998
+@set update-date 27 @value{update-month}
 @c Define a new index for options.
 @defcodeindex op
 @c Put everything except function (command, in this case) names in one
 @c index (arbitrarily chosen to be the concept index).
 @syncodeindex pg cp
 @footnotestyle separate
 @paragraphindent 2
 @finalout
 @comment %**end of header
+@c Before release, run C-u C-c C-u C-a (texinfo-all-menus-update with a
+@c prefix arg).  This updates the node pointers, which texinfmt.el needs.
 @dircategory Texinfo documentation system
 @direntry
 * Texinfo: (texinfo).           The GNU documentation format.
-* install-info: (texinfo)Invoking install-info. Update info/dir entries.
+* install-info: (texinfo)Invoking install-info. Updating info/dir entries.
-* texi2dvi: (texinfo)Format with texi2dvi.      Print Texinfo documents.
+* texi2dvi: (texinfo)Format with texi2dvi.      Printing Texinfo documentation.
-* texindex: (texinfo)Format with tex/texindex.  Sort Texinfo index files.
+* texindex: (texinfo)Format with tex/texindex.  Sorting Texinfo index files.
 * makeinfo: (texinfo)makeinfo Preferred.        Translate Texinfo source.
 @end direntry
-@c Before release, run C-u C-c C-u C-a (texinfo-all-menus-update with a
-@c prefix arg).  This updates the node pointers, which texinfmt.el needs.
 @c Set smallbook if printing in smallbook format so the example of the
 @c smallbook font is actually written using smallbook; in bigbook, a kludge
 @c is used for TeX output.  Do this through the -t option to texi2dvi,
 @c so this same source can be used for other paper sizes as well.
 @c smallbook
 @c set smallbook
 @c @@clear smallbook
-@c If you like blank pages.  Can add through texi2dvi -t.
-@c setchapternewpage odd
 @c Currently undocumented command, 5 December 1993:
 @c nwnode          (Same as node, but no warnings; for `makeinfo'.)
 @ifinfo
 This file documents Texinfo, a documentation system that can produce
-both online information and a printed manual from a single source file.
+both on-line information and a printed manual from a single source file.
-Copyright (C) 1988, 90, 91, 92, 93, 95, 96, 97, 98, 99
+Copyright (C) 1988, 90, 91, 92, 93, 95, 96, 97, 98
 Free Software Foundation, Inc.
-This edition is for Texinfo version @value{VERSION}, @value{UPDATED}.
+This edition is for Texinfo version @value{edition}.
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
 are preserved on all copies.
 into another language, under the above conditions for modified versions,
 except that this permission notice may be stated in a translation approved
 by the Free Software Foundation.
 @end ifinfo
+@setchapternewpage odd
 @shorttitlepage Texinfo
 @titlepage
 @c use the new format for titles
 @title Texinfo
 @subtitle The GNU Documentation Format
-@subtitle for Texinfo version @value{VERSION}, @value{UPDATED}
+@subtitle for Texinfo version @value{edition}
+@subtitle @value{update-month}
-@author Robert J. Chassell
-@author Richard M. Stallman
+@author Robert J.@: Chassell
+@author Richard M.@: Stallman
 @c Include the Distribution inside the titlepage so
 @c that headings are turned off.
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1988, 90, 91, 92, 93, 95, 96, 97, 98, 99
+Copyright @copyright{} 1988, 90, 91, 92, 93, 95, 96, 97, 98
 Free Software Foundation, Inc.
-This manual is for Texinfo version @value{VERSION}, @value{UPDATED}.
 Published by the Free Software Foundation @*
 59 Temple Place Suite 330 @*
 Boston, MA 02111-1307 @*
 USA @*
-ISBN 1-882114-67-1 @c for version 4.0, September 1999.
+ISBN 1-882114-65-5
-@c ISBN 1-882114-65-5 @c for version 3.12, March 1998.
 @c ISBN 1-882114-63-9 is for edition 2.20 of 28 February 1995
 @c ISBN 1-882114-64-7 is for edition 2.24 of November 1996.
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
 by the Free Software Foundation.
 @sp 2
 Cover art by Etienne Suvasa.
 @end titlepage
-@summarycontents
+@ifinfo
-@contents
+@node Top, Copying, (dir), (dir)
-@ifnottex
-@node Top
 @top Texinfo
 Texinfo is a documentation system that uses a single source file to
-produce both online information and printed output.
+produce both on-line information and printed output.@refill
 The first part of this master menu lists the major nodes in this Info
 document, including the @@-command and concept indices.  The rest of
-the menu lists all the lower level nodes in the document.
+the menu lists all the lower level nodes in the document.@refill
-This is Edition @value{VERSION} of the Texinfo manual, updated @value{UPDATED}.
+This is Edition @value{edition} of the Texinfo documentation,
-@end ifnottex
+@w{@value{update-date}}.
+@end ifinfo
+@c Here is a spare copy of the chapter menu entry descriptions,
+@c in case they are accidently deleted
+@ignore
+Your rights.
+Texinfo in brief.
+How to use Texinfo mode.
+What is at the beginning of a Texinfo file?
+What is at the end of a Texinfo file?
+How to create chapters, sections, subsections,
+appendices, and other parts.
+How to provide structure for a document.
+How to write nodes.
+How to write menus.
+How to write cross references.
+How to mark words and phrases as code,
+keyboard input, meta-syntactic
+variables, and the like.
+How to write quotations, examples, etc.
+How to write lists and tables.
+How to create indices.
+How to insert @@-signs, braces, etc.
+How to indicate results of evaluation,
+expansion of macros, errors, etc.
+How to force and prevent line and page breaks.
+How to describe functions and the like in a uniform manner.
+How to write footnotes.
+How to specify text for either @TeX{} or Info.
+How to print hardcopy.
+How to create an Info file.
+How to install an Info file
+A list of all the Texinfo @@-commands.
+Hints on how to write a Texinfo document.
+A sample Texinfo file to look at.
+Tell readers they have the right to copy
+and distribute.
+How to incorporate other Texinfo files.
+How to write page headings and footings.
+How to find formatting mistakes.
+All about paragraph refilling.
+A description of @@-Command syntax.
+Texinfo second edition features.
+A menu containing commands and variables.
+A menu covering many topics.
+@end ignore
 @menu
 * Copying::                     Your rights.
 * Overview::                    Texinfo in brief.
 * Texinfo Mode::                How to use Texinfo mode.
 * Indices::                     How to create indices.
 * Insertions::                  How to insert @@-signs, braces, etc.
 * Breaks::                      How to force and prevent line and page breaks.
 * Definition Commands::         How to describe functions and the like
 in a uniform manner.
+* Footnotes::                   How to write footnotes.
 * Conditionals::                How to specify text for either @TeX{} or Info.
-* Internationalization::
+* Macros::                      Defining new Texinfo commands.
-* Defining New Texinfo Commands::
+* Format/Print Hardcopy::       How to convert a Texinfo file to a file
-* Hardcopy::                    How to convert a Texinfo file to a file
 for printing and how to print that file.
-* Creating and Installing Info Files::
+* Create an Info File::         Convert a Texinfo file into an Info file.
+* Install an Info File::        Make an Info file accessible to users.
 * Command List::                All the Texinfo @@-commands.
 * Tips::                        Hints on how to write a Texinfo document.
 * Sample Texinfo File::         A sample Texinfo file to look at.
 * Sample Permissions::          Tell readers they have the right to copy
 and distribute.
 --- The Detailed Node Listing ---
 Overview of Texinfo
-* Reporting Bugs::              Submitting effective bug reports.
+* Using Texinfo::               Create a conventional printed book
-* Using Texinfo::               Create printed or online output.
+or an Info file.
 * Info Files::                  What is an Info file?
 * Printed Books::               Characteristics of a printed book or manual.
 * Formatting Commands::         @@-commands are used for formatting.
 * Conventions::                 General rules for writing a Texinfo file.
-* Comments::                    Writing comments and ignored text in general.
+* Comments::                    How to write comments and mark regions that
+the formatting commands will ignore.
 * Minimum::                     What a Texinfo file must have.
 * Six Parts::                   Usually, a Texinfo file has six parts.
 * Short Sample::                A short sample Texinfo file.
-* Acknowledgements and History::  Contributors and genesis.
+* Acknowledgements::
 Using Texinfo Mode
 * Texinfo Mode Overview::       How Texinfo mode can help you.
 * Emacs Editing::               Texinfo mode adds to GNU Emacs' general
 * First Line::                  The first line of a Texinfo file.
 * Start of Header::             Formatting a region requires this.
 * setfilename::                 Tell Info the name of the Info file.
 * settitle::                    Create a title for the printed work.
 * setchapternewpage::           Start chapters on right-hand pages.
-* paragraphindent::             Specify paragraph indentation.
+* paragraphindent::             An option to specify paragraph indentation.
-* exampleindent::               Specify environment indentation.
 * End of Header::               Formatting a region requires this.
 The Title and Copyright Pages
 * titlepage::                   Create a title for the printed document.
 Nodes
 * Two Paths::                   Different commands to structure
 Info output and printed output.
 * Node Menu Illustration::      A diagram, and sample nodes and menus.
-* node::                        Creating nodes, in detail.
+* node::                        How to write a node, in detail.
-* makeinfo Pointer Creation::   Letting makeinfo determine node pointers.
+* makeinfo Pointer Creation::   How to create node pointers with @code{makeinfo}.
-* anchor::                      Defining arbitrary cross-reference targets.
 The @code{@@node} Command
 * Node Names::                  How to choose node and pointer names.
 * Writing a Node::              How to write an @code{@@node} line.
 * Emphasis::                    How to emphasize text.
 Indicating Definitions, Commands, etc.
 * Useful Highlighting::         Highlighting provides useful information.
-* code::                        Indicating program code.
+* code::                        How to indicate code.
-* kbd::                         Showing keyboard input.
+* kbd::                         How to show keyboard input.
-* key::                         Specifying keys.
+* key::                         How to specify keys.
-* samp::                        Showing a literal sequence of characters.
+* samp::                        How to show a literal sequence of characters.
-* var::                         Indicating metasyntactic variables.
+* var::                         How to indicate a metasyntactic variable.
-* env::                         Indicating environment variables.
+* file::                        How to indicate the name of a file.
-* file::                        Indicating file names.
+* dfn::                         How to specify a definition.
-* command::                     Indicating command names.
+* cite::                        How to refer to a book that is not in Info.
-* option::                      Indicating option names.
+* url::                         How to indicate a world wide web reference.
-* dfn::                         Specifying definitions.
+* email::                       How to indicate an electronic mail address.
-* cite::                        Referring to books not in the  Info system.
-* acronym::                     Indicating acronyms.
-* url::                         Indicating a World Wide Web reference.
-* email::                       Indicating an electronic mail address.
 Emphasizing Text
 * emph & strong::               How to emphasize text in Texinfo.
 * Smallcaps::                   How to use the small caps font.
 * Fonts::                       Various font commands for printed output.
+* Customized Highlighting::     How to define highlighting commands.
 Quotations and Examples
 * Block Enclosing Commands::    Use different constructs for
 different purposes.
 * quotation::                   How to write a quotation.
 * example::                     How to write an example in a fixed-width font.
 * noindent::                    How to prevent paragraph indentation.
-* lisp::                        How to illustrate Lisp code.
+* Lisp Example::                How to illustrate Lisp code.
-* small::                       Forms for @code{@@smallbook}.
+* smallexample & smalllisp::    Forms for the @code{@@smallbook} option.
 * display::                     How to write an example in the current font.
 * format::                      How to write an example that does not narrow
 the margins.
 * exdent::                      How to undo the indentation of a line.
 * flushleft & flushright::      How to push text flushleft or flushright.
 Multi-column Tables
 * Multitable Column Widths::    Defining multitable column widths.
 * Multitable Rows::             Defining multitable rows, with examples.
-Indices
+Creating Indices
 * Index Entries::               Choose different words for index entries.
 * Predefined Indices::          Use different indices for different kinds
 of entry.
 * Indexing Commands::           How to make an index entry.
 * pounds::                      How to insert the pounds currency symbol.
 * minus::                       How to insert a minus sign.
 * math::                        How to format a mathematical expression.
 * Glyphs::                      How to indicate results of evaluation,
 expansion of macros, errors, etc.
-* Footnotes::                   How to include footnotes.
 * Images::                      How to include graphics.
 Inserting @@ and Braces
 * Inserting An Atsign::         How to insert @samp{@@}.
 * Equivalence::                 How to indicate equivalence.
 * Point Glyph::                 How to indicate the location of point.
 Glyphs Summary
 * result::
 * expansion::
 * Print Glyph::
 * Error Glyph::
 * Equivalence::
 * Point Glyph::
-Footnotes
-* Footnote Commands::           How to write a footnote in Texinfo.
-* Footnote Styles::             Controlling how footnotes appear in Info.
 Making and Preventing Breaks
 * Break Commands::              Cause and prevent splits.
 * Line Breaks::                 How to force a single line to use two lines.
 * Typed Functions::             Commands for functions in typed languages.
 * Typed Variables::             Commands for variables in typed languages.
 * Abstract Objects::            Commands for object-oriented programming.
 * Data Types::                  The definition command for data types.
+Footnotes
+* Footnote Commands::           How to write a footnote in Texinfo.
+* Footnote Styles::             Controlling how footnotes appear in Info.
 Conditionally Visible Text
 * Conditional Commands::        Specifying text for HTML, Info, or @TeX{}.
 * Conditional Not Commands::    Specifying text for not HTML, Info, or @TeX{}.
 * Raw Formatter Commands::      Using raw @TeX{} or HTML commands.
 flag to a string that you can insert.
 @code{@@set}, @code{@@clear}, and @code{@@value}
 * ifset ifclear::               Format a region if a flag is set.
-* set value::                   Expand a flag variable to a string.
+* value::                       Replace a flag with a string.
 * value Example::               An easy way to update edition information.
-Internationalization
+Macros: Defining New Texinfo Commands
-* documentlanguage::            Declaring the current language.
+* Defining Macros::             Both defining and undefining new commands.
-* documentencoding::            Declaring the input encoding.
-Defining New Texinfo Commands
-* Defining Macros::             Defining and undefining new commands.
 * Invoking Macros::             Using a macro, once you've defined it.
-* Macro Details::               Beyond basic macro usage.
-* alias::                       Command aliases.
+Format and Print Hardcopy
-* definfoenclose::              Customized highlighting.
-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 tex/texindex::    How to format in a shell.
-* Format with texi2dvi::        A simpler way to format.
+* Format with texi2dvi::        A simpler way to use the shell.
 * 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.
 * Compile-Command::             How to print using Emacs's compile command.
 * Requirements Summary::        @TeX{} formatting requirements summary.
-* Preparing for TeX::           What to do before you use @TeX{}.
+* Preparing for TeX::           What you need to do to use @TeX{}.
 * Overfull hboxes::             What are and what to do with overfull hboxes.
 * smallbook::                   How to print small format books and manuals.
 * A4 Paper::                    How to print on European A4 paper.
-* 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.
-Creating and Installing Info Files
-* Creating an Info File::
-* Install an Info File::
 Creating an Info File
 * makeinfo advantages::         @code{makeinfo} provides better error checking.
 * Invoking makeinfo::           How to run @code{makeinfo} from a shell.
 in Emacs Lisp are an alternative
 to @code{makeinfo}.
 * Batch Formatting::            How to format for Info in Emacs Batch mode.
 * Tag and Split Files::         How tagged and split files help Info
 to run better.
-* makeinfo html::               Generating HTML output.
 Installing an Info File
-* Directory File::              The top level menu for all Info files.
+* Directory file::              The top level menu for all Info files.
 * New Info File::               Listing a new info file.
 * Other Info Directories::      How to specify Info files that are
 located in other directories.
 * Installing Dir Entries::      How to specify what menu entry to add
 to the Info directory.
 * Using Info-validate::         How to run @code{Info-validate}.
 * Unsplit::                     How to create an unsplit file.
 * Tagifying::                   How to tagify a file.
 * Splitting::                   How to split a file manually.
+How to Obtain @TeX{}
+@c * New Texinfo Mode Commands::   The updating commands are especially useful.
+@c * New Commands::                Many newly described @@-commands.
 @end detailmenu
 @end menu
-@c Reward readers for getting to the end of the menu :).
+@node Copying, Overview, Top, Top
-@c Contributed by Arnold Robbins.
+@comment  node-name, next, previous,  up
-@quotation
-Documentation is like sex: when it is good, it is very, very good; and
-when it is bad, it is better than nothing.
----Dick Brandon
-@end quotation
-@node Copying
 @unnumbered Texinfo Copying Conditions
 @cindex Copying conditions
 @cindex Conditions for copying Texinfo
 The programs currently being distributed that relate to Texinfo include
 If these programs are modified by someone else and passed on, we want
 their recipients to know that what they have is not what we distributed,
 so that any problems introduced by others will not reflect on our
 reputation.@refill
 The precise conditions of the licenses for the programs currently
 being distributed that relate to Texinfo are found in the General Public
-Licenses that accompany them.
+Licenses that accompany them.@refill
+@node Overview, Texinfo Mode, Copying, Top
-@node Overview
+@comment  node-name,  next,  previous,  up
 @chapter Overview of Texinfo
 @cindex Overview of Texinfo
 @cindex Texinfo overview
-@dfn{Texinfo}@footnote{The first syllable of ``Texinfo'' is pronounced
+@dfn{Texinfo}@footnote{Note that the first syllable of ``Texinfo'' is
-like ``speck'', not ``hex''.  This odd pronunciation is derived from,
+pronounced like ``speck'', not ``hex''.  This odd pronunciation is
-but is not the same as, the pronunciation of @TeX{}.  In the word
+derived from, but is not the same as, the pronunciation of @TeX{}.  In
-@TeX{}, the @samp{X} is actually the Greek letter ``chi'' rather than
+the word @TeX{}, the @samp{X} is actually the Greek letter ``chi''
-the English letter ``ex''.  Pronounce @TeX{} as if the @samp{X} were the
+rather than the English letter ``ex''.  Pronounce @TeX{} as if the
-last sound in the name `Bach'; but pronounce Texinfo as if the @samp{x}
+@samp{X} were the last sound in the name `Bach'; but pronounce Texinfo
-were a `k'.  Spell ``Texinfo'' with a capital ``T'' and the other
+as if the @samp{x} were a `k'.  Spell ``Texinfo'' with a capital ``T''
-letters in lower case.}  is a documentation system that uses a single
+and write the other letters in lower case.}
-source file to produce both online information and printed output.  This
+is a documentation system that uses a single source file to produce both
-means that instead of writing two different documents, one for the
+on-line information and printed output.  This means that instead of
-online information and the other for a printed work, you need write only
+writing two different documents, one for the on-line help or other on-line
-one document.  Therefore, when the work is revised, you need revise only
+information and the other for a typeset manual or other printed work, you
-that one document.
+need write only one document.  When the work is revised, you need revise
+only one document.  (You can read the on-line information, known as an
+@dfn{Info file}, with an Info documentation-reading program.)@refill
 @menu
-* Reporting Bugs::              Submitting effective bug reports.
+* Using Texinfo::               Create a conventional printed book
-* Using Texinfo::               Create printed or online output.
+or an Info file.
 * Info Files::                  What is an Info file?
 * Printed Books::               Characteristics of a printed book or manual.
 * Formatting Commands::         @@-commands are used for formatting.
 * Conventions::                 General rules for writing a Texinfo file.
-* Comments::                    Writing comments and ignored text in general.
+* Comments::                    How to write comments and mark regions that
+the formatting commands will ignore.
 * Minimum::                     What a Texinfo file must have.
 * Six Parts::                   Usually, a Texinfo file has six parts.
 * Short Sample::                A short sample Texinfo file.
-* Acknowledgements and History::  Contributors and genesis.
+* Acknowledgements::
 @end menu
+@node Using Texinfo, Info Files, Overview, Overview
-@node Reporting Bugs
+@ifinfo
-@section Reporting Bugs
+@heading Using Texinfo
+@end ifinfo
-@cindex Bugs, reporting
-@cindex Suggestions for Texinfo, making
-@cindex Reporting bugs
-We welcome bug reports or suggestions for the Texinfo system, both
-programs and documentation.  Please email them to
-@email{bug-texinfo@@gnu.org}.  You can get the latest version of Texinfo
-from @uref{ftp://ftp.gnu.org/gnu/texinfo/} and its mirrors worldwide.
-@cindex Checklist for bug reports
-For bug reports, please include enough information for the maintainers
-to reproduce the problem.  Generally speaking, that means:
-@itemize @bullet
-@item the version number of Texinfo and the program(s) or manual(s) involved.
-@item hardware, operating system, and compiler versions.
-@item any unusual options you gave to @command{configure}.
-@item the contents of any input files necessary to reproduce the bug.
-@item a description of the problem and samples of any erroneous output.
-@item anything else that you think would be helpful.
-@end itemize
-When in doubt whether something is needed or not, include it.  It's
-better to include too much than to leave out something important.
-Patches are most welcome; if possible, please make them with
-@samp{@w{diff -c}} (@pxref{Top,, Overview, diffutils, Comparing and
-Merging Files}) and include @file{ChangeLog} entries (@pxref{Change
-Log,,, emacs, The GNU Emacs Manual}).
-When sending email, please do not encode or split the messages in any
-way if possible; it's much easier to deal with one plain text message,
-however large, than many small ones.
-@uref{ftp://ftp.gnu.org/gnu/sharutils/, GNU shar} is a convenient way of
-packaging multiple and/or binary files for email.
-@node Using Texinfo
-@section Using Texinfo
-@cindex Using Texinfo in general
-@cindex Texinfo, introduction to
-@cindex Introduction to Texinfo
 Using Texinfo, you can create a printed document with the normal
-features of a book, including chapters, sections, cross references, and
+features of a book, including chapters, sections, cross references,
-indices.  From the same Texinfo source file, you can create a
+and indices.  From the same Texinfo source file, you can create a
-menu-driven, online Info file with nodes, menus, cross references, and
+menu-driven, on-line Info file with nodes, menus, cross references,
-indices.  You can also create from that same source file an HTML output
+and indices.  You can, if you wish, make the chapters and sections of
-file suitable for use with a web browser.  @cite{The GNU Emacs Manual}
+the printed document correspond to the nodes of the on-line
-is a good example of a Texinfo file, as is this manual.
+information; and you use the same cross references and indices for
+both the Info file and the printed work.  @cite{The GNU
+Emacs Manual} is a good example of a Texinfo file, as is this manual.@refill
 To make a printed document, you process a Texinfo source file with the
-@TeX{} typesetting program (but the Texinfo language is very different
+@TeX{} typesetting program.  This creates a DVI file that you can
-from @TeX{}'s usual language, plain @TeX{}).  This creates a DVI file
+typeset and print as a book or report.  (Note that the Texinfo language
-that you can typeset and print as a book or report (@pxref{Hardcopy}).
+is completely different from @TeX{}'s usual language, plain @TeX{}.)  If
+you do not have @TeX{}, but do have @code{troff} or @code{nroff}, you
-@pindex makeinfo
+can use the @code{texi2roff} program instead.@refill
-To output an Info file, process your Texinfo source with the
-@code{makeinfo} utility or Emacs's @code{texinfo-format-buffer} command.
+To make an Info file, you process a Texinfo source file with the
-You can install the result in your Info tree (@pxref{Install an Info
+@code{makeinfo} utility or Emacs's @code{texinfo-format-buffer} command;
-File}).
+this creates an Info file that you can install on-line.@refill
-To output an HTML file, process your Texinfo source with @code{makeinfo}
+@TeX{} and @code{texi2roff} work with many types of printers; similarly,
-using the @samp{--html} option.  You can (for example) install the
+Info works with almost every type of computer terminal.  This power
-result on your web site.
+makes Texinfo a general purpose system, but brings with it a constraint,
+which is that a Texinfo file may contain only the customary
-@cindex Output formats, supporting more
+``typewriter'' characters (letters, numbers, spaces, and punctuation
-@cindex Docbook output format
+marks) but no special graphics.@refill
-@cindex SGML-tools output format
-If you are a programmer and would like to contribute to the GNU project
+A Texinfo file is a plain @sc{ascii} file containing text and
-by implementing additional output formats for Texinfo, that would be
-excellent.  But please do not write a separate translator texi2foo for
-your favorite format foo!  That is the hard way to do the job, and makes
-extra work in subsequent maintenance, since the Texinfo language is
-continually being enhanced and updated.  Instead, the best approach is
-modify @code{makeinfo} to generate the new format, as it does now for
-Info and HTML.
-@TeX{} works with virtually all printers; Info works with virtually all
-computer terminals; the HTML output works with virtually all web
-browsers.  Thus Texinfo can be used by almost any computer user.
-@cindex Source file
-A Texinfo source file is a plain @sc{ascii} file containing text and
 @dfn{@@-commands} (words preceded by an @samp{@@}) that tell the
-typesetting and formatting programs what to do.  You may edit a Texinfo
+typesetting and formatting programs what to do.  You may edit a
-file with any text editor; but it is especially convenient to use GNU
+Texinfo file with any text editor; but it is especially convenient to
-Emacs since that editor has a special mode, called Texinfo mode, that
+use GNU Emacs since that editor has a special mode, called Texinfo
-provides various Texinfo-related features.  (@xref{Texinfo Mode}.)
+mode, that provides various Texinfo-related features.  (@xref{Texinfo
+Mode}.)@refill
-Before writing a Texinfo source file, you should learn about nodes,
-menus, cross references, and the rest, for example by reading this
+Before writing a Texinfo source file, you should become familiar with
-manual.
+the Info documentation reading program and learn about nodes,
+menus, cross references, and the rest.  (@inforef{Top, info, info},
-You can use Texinfo to create both online help and printed manuals;
+for more information.)@refill
+You can use Texinfo to create both on-line help and printed manuals;
 moreover, Texinfo is freely redistributable.  For these reasons, Texinfo
-is the official documentation format of the GNU project.  More
+is the format in which documentation for GNU utilities and libraries is
-information is available at the @uref{http://www.gnu.org/doc/, GNU
+written.@refill
-documentation web page}.
+@node Info Files, Printed Books, Using Texinfo, Overview
-@cindex Man page output, not supported
+@comment  node-name,  next,  previous,  up
-From time to time, proposals are made to generate traditional Unix man
-pages from Texinfo source.  This is not likely to ever be supported,
-because man pages have a very strict conventional format.  Merely
-enhancing @command{makeinfo} to output troff format would be
-insufficient.  Generating a good man page therefore requires a
-completely different source than the typical Texinfo applications of
-generating a good user manual or a good reference manual.  This makes
-generating man pages incompatible with the Texinfo design goal of not
-having to document the same information in different ways for different
-output formats.  You might as well just write the man page directly.
-@pindex help2man
-@cindex O'Dea, Brendan
-If you wish to support man pages, the program @command{help2man} may be
-useful; it generates a traditional man page from the @samp{--help}
-output of a program.  In fact, this is currently used to generate man
-pages for the Texinfo programs themselves.  It is free software written
-by Brendan O'Dea, available from
-@uref{http://www.ozemail.com.au/~bod/help2man.tar.gz}.
-@node Info Files
 @section Info files
 @cindex Info files
 An Info file is a Texinfo file formatted so that the Info documentation
 reading program can operate on it.  (@code{makeinfo}
 @c     /usr/local/lib/info
 The @file{dir} file in the @file{info} directory serves as the
 departure point for the whole Info system.  From it, you can reach the
 `Top' nodes of each of the documents in a complete Info system.@refill
-@cindex URI syntax for Info
+@node Printed Books, Formatting Commands, Info Files, Overview
-If you wish to refer to an Info file in a URI, you can use the
+@comment  node-name,  next,  previous,  up
-(unofficial) syntax exemplified in the following.  This works with
-Emacs/W3, for example:
-@example
-info:///usr/info/emacs#Dissociated%20Press
-info:emacs#Dissociated%20Press
-info://localhost/usr/info/emacs#Dissociated%20Press
-@end example
-The @command{info} program itself does not follow URI's of any kind.
-@node Printed Books
 @section Printed Books
 @cindex Printed book and manual characteristics
 @cindex Manual characteristics, printed
 @cindex Book characteristics, printed
 @cindex Texinfo printed book characteristics
 @cindex Knuth, Donald
 A Texinfo file can be formatted and typeset as a printed book or manual.
 To do this, you need @TeX{}, a powerful, sophisticated typesetting
 program written by Donald Knuth.@footnote{You can also use the
-@pindex texi2roff@r{, unsupported software}
+@code{texi2roff} program if you do not have @TeX{}; since Texinfo is
-@uref{ftp://tug.org/texi2roff.tar.gz, @code{texi2roff}} program if you
+designed for use with @TeX{}, @code{texi2roff} is not described here.
-do not have @TeX{}; since Texinfo is designed for use with @TeX{},
+@code{texi2roff} is not part of the standard GNU distribution.}
-@code{texi2roff} is not described here.  @code{texi2roff} is not part of
-the standard GNU distribution and is not maintained or up-to-date with
-all the Texinfo features described in this manual.}
 A Texinfo-based book is similar to any other typeset, printed work: it
 can have a title page, copyright page, table of contents, and preface,
 as well as chapters, numbered or unnumbered sections and subsections,
 page headers, cross references, footnotes, and indices.@refill
 You can use Texinfo to write a book without ever having the intention
-of converting it into online information.  You can use Texinfo for
+of converting it into on-line information.  You can use Texinfo for
 writing a printed novel, and even to write a printed memo, although
 this latter application is not recommended since electronic mail is so
 much easier.@refill
 @TeX{} is a general purpose typesetting program.  Texinfo provides a
-file @file{texinfo.tex} that contains information (definitions or
+file called @file{texinfo.tex} that contains information (definitions or
 @dfn{macros}) that @TeX{} uses when it typesets a Texinfo file.
 (@file{texinfo.tex} tells @TeX{} how to convert the Texinfo @@-commands
 to @TeX{} commands, which @TeX{} can then process to create the typeset
 document.)  @file{texinfo.tex} contains the specifications for printing
-a document.  You can get the latest version of @file{texinfo.tex} from
+a document.@refill
-@uref{ftp://ftp.gnu.org/gnu/texinfo.tex}.
 Most often, documents are printed on 8.5 inch by 11 inch
 pages (216@dmn{mm} by 280@dmn{mm}; this is the default size), but you
 can also print for 7 inch by 9.25 inch pages (178@dmn{mm} by
 235@dmn{mm}; the @code{@@smallbook} size) or on European A4 size paper
 light-hearted, young and cheery.@refill
 @TeX{} is freely distributable.  It is written in a superset of Pascal
 called WEB and can be compiled either in Pascal or (by using a
 conversion program that comes with the @TeX{} distribution) in C.
-(@xref{TeX Mode, ,@TeX{} Mode, emacs, The GNU Emacs Manual}, for information
+(@xref{TeX Mode, ,@TeX{} Mode, xemacs, XEmacs User's Manual}, for information
 about @TeX{}.)@refill
 @TeX{} is very powerful and has a great many features.  Because a
 Texinfo file must be able to present information both on a
 character-only terminal in Info form and in a typeset book, the
 formatting commands that Texinfo supports are necessarily
 limited.@refill
-To get a copy of @TeX{}, see
+@xref{Obtaining TeX, , How to Obtain @TeX{}}.
-@ref{Obtaining TeX, , How to Obtain @TeX{}}.
 @node Formatting Commands, Conventions, Printed Books, Overview
 @comment  node-name,  next,  previous,  up
 @section @@-commands
 display Info files on any terminal that displays alphabetic and
 numeric characters.  Similarly, you can print the output generated by
 @TeX{} on a wide variety of printers.@refill
 Depending on what they do or what arguments@footnote{The word
-@dfn{argument} comes from the way it is used in mathematics and does not
+@dfn{argument} comes from the way it is used in mathematics and does
-refer to a dispute between two people; it refers to the information
+not refer to a disputation between two people; it refers to the
-presented to the command.  According to the @cite{Oxford English
+information presented to the command.  According to the @cite{Oxford
-Dictionary}, the word derives from the Latin for @dfn{to make clear,
+English Dictionary}, the word derives from the Latin for @dfn{to make
-prove}; thus it came to mean `the evidence offered as proof', which is
+clear, prove}; thus it came to mean `the evidence offered as proof',
-to say, `the information offered', which led to its mathematical
+which is to say, `the information offered', which led to its
-meaning.  In its other thread of derivation, the word came to mean `to
+mathematical meaning.  In its other thread of derivation, the word
-assert in a manner against which others may make counter assertions',
+came to mean `to assert in a manner against which others may make
-which led to the meaning of `argument' as a dispute.} they take, you
+counter assertions', which led to the meaning of `argument' as a
-need to write @@-commands on lines of their own or as part of
+disputation.} they take, you need to write @@-commands on lines of
-sentences:
+their own or as part of sentences:@refill
 @itemize @bullet
 @item
 Write a command such as @code{@@noindent} at the beginning of a line as
 the only text on the line.  (@code{@@noindent} prevents the beginning of
 wish (but usually within a sentence) with its argument,
 @var{sample-code} in this example, between the braces.  (@code{@@code}
 marks text as being code.)@refill
 @item
-Write a command such as @code{@@example} on a line of its own; write the
+Write a command such as @code{@@example} at the beginning of a line of
-body-text on following lines; and write the matching @code{@@end}
+its own; write the body-text on following lines; and write the matching
-command, @code{@@end example} in this case, at the on a line of its own
+@code{@@end} command, @code{@@end example} in this case, at the
-after the body-text. (@code{@@example} @dots{} @code{@@end example}
+beginning of a line of its own after the body-text. (@code{@@example}
-indents and typesets body-text as an example.)  It's usually ok to
+@dots{} @code{@@end example} indents and typesets body-text as an
-indent environment commands like this, but in complicated and
+example.)@refill
-hard-to-define circumstances the extra spaces cause extra space to
-appear in the output, so beware.
 @end itemize
 @noindent
 @cindex Braces, when to use
 As a general rule, a command requires braces if it mingles among other
 @section General Syntactic Conventions
 @cindex General syntactic conventions
 @cindex Syntactic conventions
 @cindex Conventions, syntactic
-This section describes the general conventions used in all Texinfo documents.
-@itemize @bullet
-@item
 All printable @sc{ascii} characters except @samp{@@}, @samp{@{} and
 @samp{@}} can appear in a Texinfo file and stand for themselves.
 @samp{@@} is the escape character which introduces commands.
 @samp{@{} and @samp{@}} should be used only to surround arguments to
 certain commands.  To put one of these special characters into the
 document, put an @samp{@@} character in front of it, like this:
 @samp{@@@@}, @samp{@@@{}, and @samp{@@@}}.@refill
-@item
 @ifinfo
 It is customary in @TeX{} to use doubled single-quote characters to
 begin and end quotations: ` ` and ' ' (but without a space between the
 two single-quote characters).  This convention should be followed in
 Texinfo files.  @TeX{} converts doubled single-quote characters to
 left- and right-hand doubled quotation marks and Info converts doubled
 single-quote characters to @sc{ascii} double-quotes: ` ` and ' ' to " .@refill
 @end ifinfo
 @iftex
 It is customary in @TeX{} to use doubled single-quote characters to
-begin and end quotations: @w{@t{ `` }} and @w{@t{ '' }}.  This
+begin and end quotations: @w{@tt{ `` }} and @w{@tt{ '' }}.  This
 convention should be followed in Texinfo files.  @TeX{} converts
 doubled single-quote characters to left- and right-hand doubled
 quotation marks, ``like this'', and Info converts doubled single-quote
-characters to @sc{ascii} double-quotes: @w{@t{ `` }} and
+characters to @sc{ascii} double-quotes: @w{@tt{ `` }} and
-@w{@t{ '' }} to @w{@t{ " }}.@refill
+@w{@tt{ '' }} to @w{@tt{ " }}.@refill
 @end iftex
-@item
 Use three hyphens in a row, @samp{---}, for a dash---like this.  In
 @TeX{}, a single or double hyphen produces a printed dash that is
 shorter than the usual typeset dash. Info reduces three hyphens to two
 for display on the screen.
-@item
 To prevent a paragraph from being indented in the printed manual, put
 the command @code{@@noindent} on a line by itself before the
 paragraph.@refill
-@item
 If you mark off a region of the Texinfo file with the @code{@@iftex}
 and @w{@code{@@end iftex}} commands, that region will appear only in
 the printed copy; in that region, you can use certain commands
 borrowed from plain @TeX{} that you cannot use in Info.  Likewise, if
 you mark off a region with the @code{@@ifinfo} and @code{@@end ifinfo}
 commands, that region will appear only in the Info file; in that
 region, you can use Info commands that you cannot use in @TeX{}.
 Similarly for @code{@@ifhtml @dots{} @@end ifhtml},
 @code{@@ifnothtml @dots{} @@end ifnothtml},
 @code{@@ifnotinfo @dots{} @@end ifnotinfo},
-@code{@@ifnottex @dots{} @@end ifnottex}.
+@code{@@ifnottex @dots{} @@end ifnottex},
 @xref{Conditionals}.
-@end itemize
 @cindex Tabs; don't use!
 @quotation
 @strong{Caution:} Do not use tabs in a Texinfo file!  @TeX{} uses
 variable-width fonts, which means that it cannot predefine a tab to work
 spaces when you press the @key{TAB} key.@refill
 @noindent
 Also, you can run @code{untabify} in Emacs to convert tabs in a region
 to multiple spaces.@refill
+@noindent
+Don't use tabs.
 @end quotation
 @node Comments, Minimum, Conventions, Overview
 @comment  node-name,  next,  previous,  up
 @section Comments
 You can write comments in a Texinfo file that will not appear in
 either the Info file or the printed manual by using the
 @code{@@comment} command (which may be abbreviated to @code{@@c}).
-Such comments are for the person who revises the Texinfo file.  All the
+Such comments are for the person who reads the Texinfo file.  All the
 text on a line that follows either @code{@@comment} or @code{@@c} is a
 comment; the rest of the line does not appear in either the Info file
 or the printed manual. (Often, you can write the @code{@@comment} or
 @code{@@c} in the middle of a line, and only the text that follows after
 the @code{@@comment} or @code{@@c} command does not appear; but some
 @cindex Must have in Texinfo file
 @cindex Required in Texinfo file
 @cindex Texinfo file minimum
 By convention, the names of Texinfo files end with one of the
-extensions @file{.texinfo}, @file{.texi}, @file{.txi}, or @file{.tex}.
+extensions @file{.texinfo}, @file{.texi}, or @file{.tex}.  The longer
-The longer extension is preferred since it describes more clearly to a
+extension is preferred since it describes more clearly to a human
-human reader the nature of the file.  The shorter extensions are for
+reader the nature of the file.  The shorter extensions are for
 operating systems that cannot handle long file names.@refill
 In order to be made into a printed manual and an Info file, a Texinfo
 file @strong{must} begin with lines like this:@refill
 The @dfn{End} contains commands for printing indices and generating
 the table of contents, and the @code{@@bye} command on a line of its
 own.@refill
 @end table
-@node Short Sample
+@node Short Sample, Acknowledgements, Six Parts, Overview
+@comment  node-name,  next,  previous,  up
 @section A Short Sample Texinfo File
 @cindex Sample Texinfo file
 Here is a complete but very short Texinfo file, in six parts.  The first
 three parts of the file, from @samp{\input texinfo} through to
 @samp{@@end titlepage}, look more intimidating than they are.  Most of
 the material is standard boilerplate; when you write a manual, simply
 insert the names for your own manual in this segment. (@xref{Beginning a
 File}.)@refill
+@noindent
 In the following, the sample text is @emph{indented}; comments on it are
 not.  The complete file, without any comments, is shown in
 @ref{Sample Texinfo File}.
 @subheading Part 1: Header
 @group
 \input texinfo   @@c -*-texinfo-*-
 @@c %**start of header
 @@setfilename sample.info
 @@settitle Sample Document
+@@c %**end of header
 @@setchapternewpage odd
-@@c %**end of header
 @end group
 @end example
 @subheading Part 2: Summary Description and Copyright
 @end example
 @subheading Part 6: The End of the Document
 @noindent
-The end segment contains commands for generating an index in a node and
+The end segment contains commands both for generating an index in a node
-unnumbered chapter of its own, (usually) for generating the table of
+and unnumbered chapter of its own and for generating the table of
-contents, and the @code{@@bye} command that marks the end of the
+contents; and it contains the @code{@@bye} command that marks the end of
-document.@refill
+the document.@refill
 @example
 @group
 @@node    Concept Index,    ,  First Chapter, Top
+@@comment node-name,    next,  previous,      up
 @@unnumbered Concept Index
 @end group
 @group
 @@printindex cp
 commands transform a Texinfo file such as this into
 an Info file; and @TeX{} typesets it for a printed
 manual.
 @end quotation
+@node Acknowledgements,  , Short Sample, Overview
-@node Acknowledgements and History
+@comment  node-name,  next,  previous,  up
-@section Acknowledgements and History
+@section Acknowledgements
 @cindex Stallman, Richard M.
 @cindex Chassell, Robert J.
 @cindex Berry, Karl
-Richard M.@: Stallman invented the Texinfo format, wrote the initial
+Richard M.@: Stallman wrote Edition 1.0 of this manual.  @w{Robert J.@:
-processors, and created Edition 1.0 of this manual.  @w{Robert J.@:
+Chassell} revised and extended it, starting with Edition 1.1.  Karl
-Chassell} greatly revised and extended the manual, starting with Edition
+Berry made updates for the Texinfo 3.8 and subsequent releases, starting
-1.1.  Brian Fox was responsible for the standalone Texinfo distribution
+with Edition 2.22.
-until version 3.8, and wrote the standalone @command{makeinfo} and
-@command{info}.  Karl Berry has made the updates since Texinfo 3.8 and
-subsequent releases, starting with Edition 2.22 of the manual.
 @cindex Pinard, Fran@,{c}ois
 @cindex Zuhn, David D.
 @cindex Weisshaus, Melissa
-@cindex Zaretskii, Eli
-@cindex Schwab, Andreas
-@cindex Weinberg, Zack
 Our thanks go out to all who helped improve this work, particularly to
 Fran@,{c}ois Pinard and @w{David D.@: Zuhn}, who tirelessly recorded and
 reported mistakes and obscurities; our special thanks go to Melissa
 Weisshaus for her frequent and often tedious reviews of nearly similar
-editions.  The indefatigable Eli Zaretskii and Andreas Schwab have
+editions.  Our mistakes are our own.
-provided patches beyond counting.  Zack Weinberg did the impossible by
-implementing the macro syntax in @file{texinfo.tex}.  Dozens of others
+Please send suggestions and corrections to:
-have contributed patches and suggestions, they are gratefully
-acknowledged in the @file{ChangeLog} file.  Our mistakes are our own.
+@example
+@group
-@cindex Scribe
+@r{Internet address:}
-@cindex Reid, Brian
+bug-texinfo@@gnu.org
-@cindex History of Texinfo
+@end group
-A bit of history: in the 1970's at CMU, Brian Reid developed a program
+@end example
-and format named Scribe to mark up documents for printing.  It used the
-@code{@@} character to introduce commands as Texinfo does and strived to
+@noindent
-describe document contents rather than formatting.
+Please include the manual's edition number and update date in your messages.
-@cindex Bolio
+@node Texinfo Mode, Beginning a File, Overview, Top
-@cindex Bo@TeX{}
+@comment  node-name,  next,  previous,  up
-Meanwhile, people at MIT developed another, not too dissimilar format
-called Bolio.  This then was converted to using @TeX{} as its typesetting
-language: Bo@TeX{}.
-Bo@TeX{} could only be used as a markup language for documents to be
-printed, not for online documents.  Richard Stallman (RMS) worked on
-both Bolio and Bo@TeX{}.  He also developed a nifty on-line help format
-called Info, and then combined Bo@TeX{} and Info to create Texinfo, a
-mark up language for text that is intended to be read both on line and
-as printed hard copy.
-@node Texinfo Mode
 @chapter Using Texinfo Mode
 @cindex Texinfo mode
 @cindex Mode, using Texinfo
 @cindex GNU Emacs
 @cindex Emacs
 @ifinfo
 @heading Texinfo Mode Overview
 @end ifinfo
 Texinfo mode provides special features for working with Texinfo
-files.
+files:@refill
-You can:@refill
 @itemize @bullet
 @item
 Insert frequently used @@-commands. @refill
 a regular expression matching the commands for chapters and their
 equivalents, such as appendices.  With this value for the page
 delimiter, you can jump from chapter title to chapter title with the
 @kbd{C-x ]} (@code{forward-page}) and @kbd{C-x [}
 (@code{backward-page}) commands and narrow to a chapter with the
-@kbd{C-x p} (@code{narrow-to-page}) command.  (@xref{Pages, , ,emacs,
+@kbd{C-x p} (@code{narrow-to-page}) command.  (@xref{Pages, , , xemacs,
-The GNU Emacs Manual}, for details about the page commands.)@refill
+XEmacs User's Manual}, for details about the page commands.)@refill
 You may name a Texinfo file however you wish, but the convention is to
-end a Texinfo file name with one of the extensions
+end a Texinfo file name with one of the three extensions
-@file{.texinfo}, @file{.texi}, @file{.txi}, or @file{.tex}.  A longer
+@file{.texinfo}, @file{.texi}, or @file{.tex}.  A longer extension is
-extension is preferred, since it is explicit, but a shorter extension
+preferred, since it is explicit, but a shorter extension may be
-may be necessary for operating systems that limit the length of file
+necessary for operating systems that limit the length of file names.
-names.  GNU Emacs automatically enters Texinfo mode when you visit a
+GNU Emacs automatically enters Texinfo mode when you visit a file with
-file with a @file{.texinfo}, @file{.texi} or @file{.txi}
+a @file{.texinfo} or  @file{.texi}
 extension.  Also, Emacs switches to Texinfo mode
 when you visit a
 file that has @samp{-*-texinfo-*-} in its first line.  If ever you are
 in another mode and wish to switch to Texinfo mode, type @code{M-x
 texinfo-mode}.@refill
 cursor in the @file{*Occur*} buffer.@refill
 @end table
 If you call @code{texinfo-show-structure} with a prefix argument by
 typing @w{@kbd{C-u C-c C-s}}, it will list not only those lines with the
-@@-commands for @code{@@chapter}, @code{@@section}, and the like, but
+@@-commands for @code{@@chapter}, @code{@@section}, and the like,
-also the @code{@@node} lines.  You can use @code{texinfo-show-structure}
+but also the @code{@@node} lines.  (This is how the
-with a prefix argument to check whether the `Next', `Previous', and `Up'
+@code{texinfo-show-structure} command worked without an argument in
-pointers of an @code{@@node} line are correct.
+the first version of Texinfo.  It was changed because @code{@@node}
+lines clutter up the @samp{*Occur*} buffer and are usually not
+needed.)  You can use @code{texinfo-show-structure} with a prefix
+argument to check whether the `Next', `Previous', and `Up' pointers of
+an @code{@@node} line are correct.@refill
 Often, when you are working on a manual, you will be interested only
 in the structure of the current chapter.  In this case, you can mark
 off the region of the buffer that you are interested in by using the
 @kbd{C-x n n} (@code{narrow-to-region}) command and
 @code{texinfo-show-structure} will work on only that region.  To see
 the whole buffer again, use @w{@kbd{C-x n w}} (@code{widen}).
-(@xref{Narrowing, , , emacs, The GNU Emacs Manual}, for more
+(@xref{Narrowing, , , xemacs, XEmacs User's Manual}, for more
 information about the narrowing commands.)@refill
 @vindex page-delimiter
 @cindex Page delimiter in Texinfo mode
 In addition to providing the @code{texinfo-show-structure} command,
 Texinfo mode sets the value of the page delimiter variable to match
 the chapter-level @@-commands.  This enables you to use the @kbd{C-x
 ]} (@code{forward-page}) and @kbd{C-x [} (@code{backward-page})
 commands to move forward and backward by chapter, and to use the
 @kbd{C-x p} (@code{narrow-to-page}) command to narrow to a chapter.
-@xref{Pages, , , emacs, The GNU Emacs Manual}, for more information
+@xref{Pages, , , xemacs, XEmacs User's Manual}, for more information
 about the page commands.@refill
 @node Updating Nodes and Menus, Info Formatting, Showing the Structure, Texinfo Mode
 @comment  node-name,  next,  previous,  up
 @section Updating Nodes and Menus
 @node Updating Commands, Updating Requirements, Updating Nodes and Menus, Updating Nodes and Menus
 @ifinfo
 @subheading The Updating Commands
 @end ifinfo
-You can use the updating commands to:@refill
+You can use the updating commands@refill
 @itemize @bullet
 @item
-insert or update the `Next', `Previous', and `Up' pointers of a
+to insert or update the `Next', `Previous', and `Up' pointers of a
 node,@refill
 @item
-insert or update the menu for a section, and@refill
+to insert or update the menu for a section, and@refill
 @item
-create a master menu for a Texinfo source file.@refill
+to create a master menu for a Texinfo source file.@refill
 @end itemize
 You can also use the commands to update all the nodes and menus in a
 region or in a whole Texinfo file.@refill
 the @code{@@node} line and the structuring command line; and you may
 interpose only an @code{@@comment} line or an @code{@@ifinfo} line.
 Commands which work on a whole buffer require that the `Top' node be
 followed by a node with an @code{@@chapter} or equivalent-level command.
-The menu updating commands will not create a main or master menu for a
+Note that the menu updating commands will not create a main or master
-Texinfo file that has only @code{@@chapter}-level nodes!  The menu
+menu for a Texinfo file that has only @code{@@chapter}-level nodes!  The
-updating commands only create menus @emph{within} nodes for lower level
+menu updating commands only create menus @emph{within} nodes for lower level
 nodes.  To create a menu of chapters, you must provide a `Top'
-node.
+node.@refill
 The menu updating commands remove menu entries that refer to other Info
 files since they do not refer to nodes within the current buffer.  This
 is a deficiency.  Rather than use menu entries, you can use cross
 references to refer to other Info files.  None of the updating commands
 @noindent
 This updates all the nodes and menus completely and all at once.@refill
 @end table
 The other major updating commands do smaller jobs and are designed for
-the person who updates nodes and menus as he or she writes a Texinfo
+the person  who updates nodes and menus as he or she writes a Texinfo
 file.@refill
 @need 1000
 The commands are:@refill
 The @code{texinfo-column-for-description} variable specifies the
 column to which menu descriptions are indented.  By default, the value
 is 32 although it is often useful to reduce it to as low as 24.  You
 can set the variable with the @kbd{M-x edit-options} command
-(@pxref{Edit Options, , Editing Variable Values, emacs, The GNU Emacs
+(@pxref{Edit Options, , Editing Variable Values, xemacs, XEmacs User's
-Manual}) or with the @kbd{M-x set-variable} command (@pxref{Examining,
+Manual}) or with the @kbd{M-x set-variable} command (@pxref{Examining, ,
-, Examining and Setting Variables, emacs, The GNU Emacs
+Examining and Setting Variables, xemacs, XEmacs User's Manual}).@refill
-Manual}).@refill
 Also, the @code{texinfo-indent-menu-description} command may be used to
 indent existing menu descriptions to a specified column.  Finally, if
 you wish, you can use the @code{texinfo-insert-node-lines} command to
 insert missing @code{@@node} lines into a file.  (@xref{Other Updating
 @noindent
 In this example, `Comments' is the name of both the node and the
 section.  The next node is called `Minimum' and the previous node is
 called `Conventions'.  The `Comments' section is within the `Overview'
 node, which is specified by the `Up' pointer.  (Instead of an
-@code{@@comment} line, you may also write an @code{@@ifinfo} line.)@refill
+@code{@@comment} line, you can write an @code{@@ifinfo} line.)@refill
 If a file has a `Top' node, it must be called @samp{top} or @samp{Top}
 and be the first node in the file.@refill
 The menu updating commands create a menu of sections within a chapter,
 a menu of subsections within a section, and so on.  This means that
 you must have a `Top' node if you want a menu of chapters.@refill
-Incidentally, the @code{makeinfo} command will create an Info file for a
+Incidentally, the @code{makeinfo} command will create an Info file for
-hierarchically organized Texinfo file that lacks `Next', `Previous' and
+a hierarchically organized Texinfo file that lacks `Next', `Previous'
-`Up' pointers.  Thus, if you can be sure that your Texinfo file will be
+and `Up' pointers.  Thus, if you can be sure that your Texinfo file
-formatted with @code{makeinfo}, you have no need for the update node
+will be formatted with @code{makeinfo}, you have no need for the
-commands.  (@xref{Creating an Info File}, for more information about
+`update node' commands.  (@xref{Create an Info File, , Creating an
-@code{makeinfo}.)  However, both @code{makeinfo} and the
+Info File}, for more information about @code{makeinfo}.)  However,
-@code{texinfo-format-@dots{}} commands require that you insert menus in
+both @code{makeinfo} and the @code{texinfo-format-@dots{}} commands
-the file.
+require that you insert menus in the file.@refill
 @node Other Updating Commands,  , Updating Requirements, Updating Nodes and Menus
 @comment  node-name,  next,  previous,  up
 @subsection Other Updating Commands
 @example
 C-x h C-u M-x texinfo-insert-node-lines
 @end example
-This command inserts titles as node names in @code{@@node} lines; the
+(Note that this command inserts titles as node names in @code{@@node}
-@code{texinfo-start-menu-description} command (@pxref{Inserting,
+lines; the @code{texinfo-start-menu-description} command
-Inserting Frequently Used Commands}) inserts titles as descriptions in
+(@pxref{Inserting, Inserting Frequently Used Commands}) inserts titles
-menu entries, a different action.  However, in both cases, you need to
+as descriptions in menu entries, a different action.  However, in both
-edit the inserted text.
+cases, you need to edit the inserted text.)@refill
 @item M-x texinfo-multiple-files-update
 @findex texinfo-multiple-files-update @r{(in brief)}
 Update nodes and menus in a document built from several separate files.
 With @kbd{C-u} as a prefix argument, create and insert a master menu in
 @end example
 For @TeX{} or the Info formatting commands to work, the file @emph{must}
 include a line that has @code{@@setfilename} in its header.@refill
-@xref{Creating an Info File}, for details about Info formatting.@refill
+@xref{Create an Info File}, for details about Info formatting.@refill
 @node Printing, Texinfo Mode Summary, Info Formatting, Texinfo Mode
 @comment node-name,  next,  previous,  up
 @section Formatting and Printing
 @cindex Formatting for printing
 include an @code{@@settitle} line.  The file must end with @code{@@bye}
 on a line by itself.  (When you use @code{texinfo-tex-region}, you must
 surround the @code{@@settitle} line with start-of-header and
 end-of-header lines.)@refill
-@xref{Hardcopy}, for a description of the other @TeX{} related
+@xref{Format/Print Hardcopy}, for a description of the other @TeX{} related
 commands, such as @code{tex-show-print-queue}.@refill
 @node Texinfo Mode Summary,  , Printing, Texinfo Mode
 @comment  node-name,  next,  previous,  up
 @section Texinfo Mode Summary
 @subheading The Master Update Command
 The @code{texinfo-master-menu} command creates a master menu; and can
 be used to update every node and menu in a file as well.@refill
-@c Probably should use @tables in this section.
 @example
 @group
 C-c C-u m
 M-x texinfo-master-menu
 @r{Create or update a master menu.}
 C-c C-t C-l     @r{Recenter the output buffer.}
 @end example
 @subheading Other Updating Commands
-The remaining updating commands do not have standard keybindings because
+The `other updating commands' do not have standard keybindings because
 they are rarely used.
 @example
 @group
 M-x texinfo-insert-node-lines
 * First Line::                  The first line of a Texinfo file.
 * Start of Header::             Formatting a region requires this.
 * setfilename::                 Tell Info the name of the Info file.
 * settitle::                    Create a title for the printed work.
 * setchapternewpage::           Start chapters on right-hand pages.
-* paragraphindent::             Specify paragraph indentation.
+* paragraphindent::             An option to specify paragraph indentation.
-* exampleindent::               Specify environment indentation.
 * End of Header::               Formatting a region requires this.
 @end menu
+@node First Line, Start of Header, Header, Header
-@node First Line
+@comment  node-name,  next,  previous,  up
 @subsection The First Line of a Texinfo File
 @cindex First line of a Texinfo file
 @cindex Beginning line of a Texinfo file
 @cindex Header of a Texinfo file
 @end example
 The odd string of characters, @samp{%**}, is to ensure that no other
 comment is accidentally taken for a start-of-header line.@refill
-@node setfilename
+@node setfilename, settitle, Start of Header, Header
+@comment  node-name,  next,  previous,  up
 @subsection @code{@@setfilename}
 @cindex Info file requires @code{@@setfilename}
 @findex setfilename
 In order to serve as the primary input file for either @code{makeinfo}
 follow it on the same line by the Info file name.  Do not write anything
 else on the line; anything on the line after the command is considered
 part of the file name, including what would otherwise be a
 comment.
-The @code{@@setfilename} line specifies the name of the output file to
+The @code{@@setfilename} line specifies the name of the Info file to be
-be generated.  This name should be different from the name of the
+generated.  This name should be different from the name of the Texinfo
-Texinfo file.  There are two conventions for choosing the name: you can
+file.  There are two conventions for choosing the name: you can either
-either remove the extension (such as @samp{.texi}) from the input file
+remove the @samp{.texi} extension from the input file name, or replace
-name, or replace it with the @samp{.info} extension.  When producing
+it with the @samp{.info} extension.
-HTML output, @code{makeinfo} will replace any extension with
-@samp{html}, or add @samp{.html} if the given name has no extension.
 Some operating systems cannot handle long file names.  You can run into
 a problem even when the file name you specify is itself short enough.
 This occurs because the Info formatters split a long Info file into
 short indirect subfiles, and name them by appending @samp{-1},
 @samp{-2}, @dots{}, @samp{-10}, @samp{-11}, and so on, to the original
 file name.  (@xref{Tag and Split Files, , Tag Files and Split Files}.)
 The subfile name @file{texinfo.info-10}, for example, is too long for
 some systems; so the Info file name for this document is @file{texinfo}
-rather than @file{texinfo.info}.  When @code{makeinfo} is running on
+rather than @file{texinfo.info}.
-operating systems such as MS-DOS which impose grave limits on file
-names, it will sometimes remove some characters from the original file
-name to leave enough space for the subfile suffix, thus producing files
-named @file{texin-10}, @file{gcc.i12}, etc.
 @cindex Ignored before @code{@@setfilename}
-@cindex @samp{\input} source line ignored
 The Info formatting commands ignore everything written before the
 @code{@@setfilename} line, which is why the very first line of
 the file (the @code{\input} line) does not show up in the output.
 @pindex texinfo.cnf
 The @code{@@setfilename} line produces no output when you typeset a
-manual with @TeX{}, but it is nevertheless essential: it opens the
+manual with @TeX{}, but it nevertheless is essential: it opens the
 index, cross-reference, and other auxiliary files used by Texinfo, and
 also reads @file{texinfo.cnf} if that file is present on your system
-(@pxref{Preparing for TeX,, Preparing for @TeX{}}).
+(@pxref{Preparing for TeX,, Preparing to Use @TeX{}}).
 @node settitle, setchapternewpage, setfilename, Header
 @comment  node-name,  next,  previous,  up
 @subsection @code{@@settitle}
 You may, if you wish, create your own, customized headings and
 footings.  @xref{Headings, , Page Headings}, for a detailed discussion
 of this process.@refill
+@node setchapternewpage, paragraphindent, settitle, Header
-@node setchapternewpage
+@comment  node-name,  next,  previous,  up
 @subsection @code{@@setchapternewpage}
 @cindex Starting chapters
 @cindex Pages, starting odd
 @findex setchapternewpage
-In an officially bound book, text is usually printed on both sides of
+In a book or a manual, text is usually printed on both sides of the
-the paper, chapters start on right-hand pages, and right-hand pages have
+paper, chapters start on right-hand pages, and right-hand pages have
 odd numbers.  But in short reports, text often is printed only on one
 side of the paper.  Also in short reports, chapters sometimes do not
 start on new pages, but are printed on the same page as the end of the
 preceding chapter, after a small amount of vertical whitespace.@refill
 You can use the @code{@@setchapternewpage} command with various
 arguments to specify how @TeX{} should start chapters and whether it
-should format headers for printing on one or both sides of the paper
+should typeset pages for printing on one or both sides of the paper
 (single-sided or double-sided printing).@refill
 Write the @code{@@setchapternewpage} command at the beginning of a
 line followed by its argument.@refill
 You can specify one of three alternatives with the
 @code{@@setchapternewpage} command:@refill
 @table @asis
+@ignore
+@item No @code{@@setchapternewpage} command
+If the Texinfo file does not contain an @code{@@setchapternewpage}
+command before the @code{@@titlepage} command, @TeX{} automatically
+begins chapters on new pages and prints headings in the standard
+format for single-sided printing.  This is the conventional format for
+single-sided printing.@refill
+The result is exactly the same as when you write
+@code{@@setchapternewpage on}.@refill
+@end ignore
 @item @code{@@setchapternewpage off}
 Cause @TeX{} to typeset a new chapter on the same page as the last
 chapter, after skipping some vertical whitespace.  Also, cause @TeX{} to
 format page headers for single-sided printing. (You can override the
 headers format with the @code{@@headings double} command; see
 @ref{headings on off, , The @code{@@headings} Command}.)@refill
 @item @code{@@setchapternewpage on}
-Cause @TeX{} to start new chapters on new pages and to format page
+Cause @TeX{} to start new chapters on new pages and to typeset page
 headers for single-sided printing.  This is the form most often
-used for short reports or personal printing.
+used for short reports.@refill
 This alternative is the default.@refill
 @item @code{@@setchapternewpage odd}
 Cause @TeX{} to start new chapters on new, odd-numbered pages
 (right-handed pages) and to typeset for double-sided printing.  This is
 the form most often used for books and manuals.@refill
 @end table
+@noindent
 Texinfo does not have an @code{@@setchapternewpage even} command.@refill
-You can countermand or modify the effect on headers of an
+@noindent
-@code{@@setchapternewpage} command with an @code{@@headings} command.
+(You can countermand or modify an @code{@@setchapternewpage} command
-@xref{headings on off, , The @code{@@headings} Command}.@refill
+with an @code{@@headings} command.  @xref{headings on off, , The
+@code{@@headings} Command}.)@refill
 At the beginning of a manual or book, pages are not numbered---for
 example, the title and copyright pages of a book are not numbered.
 By convention, table of contents pages are numbered with roman
 numerals and not in sequence with the rest of the document.@refill
 Since an Info file does not have pages, the @code{@@setchapternewpage}
 command has no effect on it.@refill
-We recommend not including any @code{@@setchapternewpage} command in
+Usually, you do not write an @code{@@setchapternewpage} command for
-your manual sources at all, since the desired output is not intrinsic to
+single-sided printing, but accept the default which is to typeset for
-the document.  Instead, if you don't want the default option (no blank
+single-sided printing and to start new chapters on new pages.  Usually,
-pages, same headers on all pages) use the @option{--texinfo} option to
+you write an @code{@@setchapternewpage odd} command for double-sided
-@command{texi2dvi} to specify the output you want.
+printing.@refill
+@node paragraphindent, End of Header, setchapternewpage, Header
+@comment  node-name,  next,  previous,  up
-@node paragraphindent
 @subsection Paragraph Indenting
 @cindex Indenting paragraphs
 @cindex Paragraph indentation
 @findex paragraphindent
-The Texinfo processors may insert whitespace at the beginning of the
+The Info formatting commands may insert spaces at the beginning of the
-first line of each paragraph, thereby indenting that paragraph.  You can
+first line of each paragraph, thereby indenting that paragraph.  You
-use the @code{@@paragraphindent} command to specify this indentation.
+can use the @code{@@paragraphindent} command to specify the
-Write an @code{@@paragraphindent} command at the beginning of a line
+indentation.  Write an @code{@@paragraphindent} command at the
-followed by either @samp{asis} or a number:
+beginning of a line followed by either @samp{asis} or a number.  The
+template is:@refill
 @example
 @@paragraphindent @var{indent}
 @end example
-The indentation is according to the value of @var{indent}:
+The Info formatting commands indent according to the value of
+@var{indent}:@refill
-@table @asis
-@item @code{asis}
+@itemize @bullet
-Do not change the existing indentation (not implemented in @TeX{}).
+@item
+If the value of @var{indent} is @samp{asis}, the Info formatting
-@item 0
+commands do not change the existing indentation.@refill
-Omit all indentation.
+@item
-@item @var{n}
+If the value of @var{indent} is zero, the Info formatting commands delete
-Indent by @var{n} space characters in Info output, by @var{n} ems in
+existing indentation.@refill
-@TeX{}.
+@item
-@end table
+If the value of @var{indent} is greater than zero, the Info formatting
+commands indent the paragraph by that number of spaces.@refill
-The default value of @var{indent} is @samp{asis}.
+@end itemize
-@code{@@paragraphindent} is ignored for HTML output.
+The default value of @var{indent} is @samp{asis}.@refill
 Write the @code{@@paragraphindent} command before or shortly after the
 end-of-header line at the beginning of a Texinfo file.  (If you write
 the command between the start-of-header and end-of-header lines, the
-region formatting commands indent paragraphs as specified.)
+region formatting commands indent paragraphs as specified.)@refill
 A peculiarity of the @code{texinfo-format-buffer} and
 @code{texinfo-format-region} commands is that they do not indent (nor
 fill) paragraphs that contain @code{@@w} or @code{@@*} commands.
-@xref{Refilling Paragraphs}, for further information.
+@xref{Refilling Paragraphs}, for a detailed description of what goes
+on.@refill
-@node exampleindent
+@node End of Header,  , paragraphindent, Header
-@subsection @code{@@exampleindent}: Environment Indenting
+@comment  node-name,  next,  previous,  up
-@cindex Indenting environments
-@cindex Environment indentation
-@cindex Example indentation
-@findex exampleindent
-The Texinfo processors indent each line of @code{@@example} and similar
-environments.  You can use the @code{@@exampleindent} command to specify
-this indentation.  Write an @code{@@exampleindent} command at the
-beginning of a line followed by either @samp{asis} or a number:
-@example
-@@exampleindent @var{indent}
-@end example
-The indentation is according to the value of @var{indent}:
-@table @asis
-@item @code{asis}
-Do not change the existing indentation (not implemented in @TeX{}).
-@item 0
-Omit all indentation.
-@item @var{n}
-Indent environments by @var{n} space characters in Info output, by
-@var{n} ems in @TeX{}.
-@end table
-The default value of @var{indent} is 5.  @code{@@exampleindent} is
-ignored for HTML output.
-Write the @code{@@exampleindent} command before or shortly after the
-end-of-header line at the beginning of a Texinfo file.  (If you write
-the command between the start-of-header and end-of-header lines, the
-region formatting commands indent examples as specified.)
-@node End of Header
 @subsection End of Header
 @cindex End of header line
 Follow the header lines with an @w{end-of-header} line.
 An end-of-header line looks like this:@refill
 @iftex
 @xref{Start of Header}.
 @end iftex
+@node Info Summary and Permissions, Titlepage & Copyright Page, Header, Beginning a File
-@node Info Summary and Permissions
+@comment  node-name,  next,  previous,  up
 @section Summary and Copying Permissions for Info
 The title page and the copyright page appear only in the printed copy of
 the manual; therefore, the same information must be inserted in a
 section that appears only in the Info file.  This section usually
 The permissions text appears in an Info file @emph{before} the first
 node.  This mean that a reader does @emph{not} see this text when
 reading the file using Info, except when using the advanced Info command
 @kbd{g *}.
+@node Titlepage & Copyright Page, The Top Node, Info Summary and Permissions, Beginning a File
-@node Titlepage & Copyright Page
+@comment  node-name,  next,  previous,  up
 @section The Title and Copyright Pages
 A manual's name and author are usually printed on a title page.
 Sometimes copyright information is printed on the title page as well;
 more often, copyright information is printed on the back of the title
 The title and copyright pages appear in the printed manual, but not in the
 Info file.  Because of this, it is possible to use several slightly
 obscure @TeX{} typesetting commands that cannot be used in an Info file.
 In addition, this part of the beginning of a Texinfo file contains the text
 of the copying permissions that will appear in the printed manual.@refill
-@cindex Titlepage, for plain text
-You may wish to include titlepage-like information for plain text
-output.  Simply place any such leading material between @code{@@ifinfo}
-and @code{@@end ifinfo}; @command{makeinfo} includes this in its plain
-text output.  It will not show up in the Info readers.
 @xref{Titlepage Permissions, , Titlepage Copying Permissions}, for the
 standard text for the copyright permissions.@refill
 @menu
 copyright pages.
 * headings on off::             An option for turning headings on and off
 and double or single sided printing.
 @end menu
 @node titlepage, titlefont center sp, Titlepage & Copyright Page, Titlepage & Copyright Page
 @comment  node-name,  next,  previous,  up
 @subsection @code{@@titlepage}
 @cindex Title page
 @findex titlepage
 with @code{@@titlepage} on a line by itself and end it with
 @code{@@end titlepage} on a line by itself.@refill
 The @code{@@end titlepage} command starts a new page and turns on page
 numbering.  (@xref{Headings, , Page Headings}, for details about how to
-generate page headings.)  All the material that you want to appear on
+generate page headings.)  All the material that you want to
-unnumbered pages should be put between the @code{@@titlepage} and
+appear on unnumbered pages should be put between the
-@code{@@end titlepage} commands.  You can force the table of contents to
+@code{@@titlepage} and @code{@@end titlepage} commands.  By using the
-appear there with the @code{@@setcontentsaftertitlepage} command
+@code{@@page} command you can force a page break within the region
-(@pxref{Contents}).
+delineated by the @code{@@titlepage} and @code{@@end titlepage}
+commands and thereby create more than one unnumbered page.  This is
-@findex page@r{, within @code{@@titlepage}}
+how the copyright page is produced.  (The @code{@@titlepage} command
-By using the @code{@@page} command you can force a page break within the
+might perhaps have been better named the
-region delineated by the @code{@@titlepage} and @code{@@end titlepage}
+@code{@@titleandadditionalpages} command, but that would have been
-commands and thereby create more than one unnumbered page.  This is how
+rather long!)@refill
-the copyright page is produced.  (The @code{@@titlepage} command might
-perhaps have been better named the @code{@@titleandadditionalpages}
+@c !!! append refill to footnote when makeinfo can handle it.
-command, but that would have been rather long!)
 When you write a manual about a computer program, you should write the
-version of the program to which the manual applies on the title page.
+version of the program to which the manual applies on the title
-If the manual changes more frequently than the program or is independent
+page.  If the manual changes more frequently than the program or is
-of it, you should also include an edition number@footnote{We have found
+independent of it, you should also include an edition
-that it is helpful to refer to versions of manuals as `editions' and
+number@footnote{We have found that it is helpful to refer to versions
-versions of programs as `versions'; otherwise, we find we are liable to
+of manuals as `editions' and versions of programs as `versions';
-confuse each other in conversation by referring to both the
+otherwise, we find we are liable to confuse each other in conversation
-documentation and the software with the same words.} for the manual.
+by referring to both the documentation and the software with the same
-This helps readers keep track of which manual is for which version of
+words.} for the manual.  This helps readers keep track of which manual
-the program.  (The `Top' node should also contain this information; see
+is for which version of the program.  (The `Top' node
-@ref{makeinfo top, , @code{@@top}}.)
+should also contain this information; see @ref{makeinfo top, ,
+@code{@@top}}.)@refill
 Texinfo provides two main methods for creating a title page.  One method
 uses the @code{@@titlefont}, @code{@@sp}, and @code{@@center} commands
 to generate a title page in which the words on the page are
-centered.
+centered.@refill
 The second method uses the @code{@@title}, @code{@@subtitle}, and
 @code{@@author} commands to create a title page with black rules under
 the title and author lines and the subtitle text set flush to the
 right hand side of the page.  With this method, you do not specify any
 of the actual formatting of the title page.  You specify the text
-you want, and Texinfo does the formatting.
+you want, and Texinfo does the formatting.  You may use either
+method.@refill
-You may use either method, or you may combine them; see the examples in
-the sections below.
 @findex shorttitlepage
-@cindex Bastard title page
+For extremely simple applications, Texinfo also provides a command
-@cindex Title page, bastard
+@code{@@shorttitlepage} which takes a single argument as the title.
-For extremely simple applications, and for the bastard title page in
+The argument is typeset on a page by itself and followed by a blank
-traditional book front matter, Texinfo also provides a command
+page.
-@code{@@shorttitlepage} which takes a single argument as the title.  The
-argument is typeset on a page by itself and followed by a blank page.
+@node titlefont center sp, title subtitle author, titlepage, Titlepage & Copyright Page
+@comment  node-name,  next,  previous,  up
-@node titlefont center sp
 @subsection @code{@@titlefont}, @code{@@center}, and @code{@@sp}
 @findex titlefont
 @findex center
 @findex sp @r{(titlepage line spacing)}
 You can use the @code{@@titlefont}, @code{@@sp}, and @code{@@center}
 commands to create a title page for a printed document.  (This is the
 first of the two methods for creating a title page in Texinfo.)@refill
 Use the @code{@@titlefont} command to select a large font suitable for
-the title itself.  You can use @code{@@titlefont} more than once if you
+the title itself.@refill
-have an especially long title.
 @need 700
 For example:
 @example
 @dots{}
 @@end titlepage
 @end group
 @end example
-The spacing of the example fits an 8.5 by 11 inch manual.@refill
+The spacing of the example fits an 8 1/2 by 11 inch manual.@refill
+@node title subtitle author, Copyright & Permissions, titlefont center sp, Titlepage & Copyright Page
-@node title subtitle author
+@comment  node-name,  next,  previous,  up
 @subsection @code{@@title}, @code{@@subtitle}, and @code{@@author}
 @findex title
 @findex subtitle
 @findex author
 You can use the @code{@@title}, @code{@@subtitle}, and @code{@@author}
 commands to create a title page in which the vertical and horizontal
 spacing is done for you automatically.  This contrasts with the method
-described in the previous section, in which the @code{@@sp} command is
+described in
-needed to adjust vertical spacing.
+the previous section, in which the @code{@@sp} command is needed to
+adjust vertical spacing.@refill
 Write the @code{@@title}, @code{@@subtitle}, or @code{@@author}
 commands at the beginning of a line followed by the title, subtitle,
 or author.@refill
 The @code{@@title} command produces a line in which the title is set
 flush to the left-hand side of the page in a larger than normal font.
-The title is underlined with a black rule.  Only a single line is
+The title is underlined with a black rule.@refill
-allowed; the @code{@@*} command may not be used to break the title into
-two lines.  To handle very long titles, you may find it profitable to
-use both @code{@@title} and @code{@@titlefont}; see the final example in
-this section.
 The @code{@@subtitle} command sets subtitles in a normal-sized font
 flush to the right-hand side of the page.@refill
 The @code{@@author} command sets the names of the author or authors in
 @dots{}
 @@end titlepage
 @end group
 @end example
-You may also combine the @code{@@titlefont} method described in the
+@ifinfo
-previous section and @code{@@title} method described in this one.  This
+@noindent
-may be useful if you have a very long title.  Here is a real-life example:
+Contrast this form with the form of a title page written using the
+@code{@@sp}, @code{@@center}, and @code{@@titlefont} commands:@refill
-@example
-@group
+@example
 @@titlepage
-@@titlefont@{GNU Software@}
+@@sp 10
+@@center @@titlefont@{Name of Manual When Printed@}
+@@sp 2
+@@center Subtitle, If Any
 @@sp 1
-@@title for MS-Windows and MS-DOS
+@@center Second subtitle
-@@subtitle Edition @@value@{edition@} for Release @@value@{cd-edition@}
+@@sp 2
-@@author by Daniel Hagerty, Melissa Weisshaus
+@@center Author
-@@author and Eli Zaretskii
+@@page
-@end group
+@dots{}
-@end example
+@@end titlepage
+@end example
-@noindent
+@end ifinfo
-(The use of @code{@@value} here is explained in @ref{value
-Example,,@code{@@value} Example}.)
+@node Copyright & Permissions, end titlepage, title subtitle author, Titlepage & Copyright Page
+@comment  node-name,  next,  previous,  up
-@node Copyright & Permissions
 @subsection Copyright Page and Permissions
 @cindex Copyright page
 @cindex Printed permissions
 @cindex Permissions, printed
 @example
 Copyright @copyright{} @var{year} @var{copyright-owner}
 @end example
 It is customary to put information on how to get a manual after the
-copyright notice, followed by the copying permissions for the manual.
+copyright notice, followed by the copying permissions for the
+manual.@refill
-Permissions must be given here as well as in the summary segment within
-@code{@@ifinfo} and @code{@@end ifinfo} that immediately follows the
+Note that permissions must be given here as well as in the summary
-header since this text appears only in the printed manual and the
+segment within @code{@@ifinfo} and @code{@@end ifinfo} that
-@samp{ifinfo} text appears only in the Info file.
+immediately follows the header since this text appears only in the
+printed manual and the @samp{ifinfo} text appears only in the Info
+file.@refill
 @xref{Sample Permissions}, for the standard text.@refill
+@node end titlepage, headings on off, Copyright & Permissions, Titlepage & Copyright Page
-@node end titlepage
+@comment  node-name,  next,  previous,  up
 @subsection Heading Generation
 @findex end titlepage
 @cindex Headings, page, begin to appear
 @cindex Titlepage end starts headings
 @cindex End titlepage starts headings
 @item @@headings single
 Turn on page headings appropriate for single-sided printing.
 @refill
 @item @@headings double
-@itemx @@headings on
 Turn on page headings appropriate for double-sided printing.  The two
 commands, @code{@@headings on} and @code{@@headings double}, are
 synonymous.@refill
 @item @@headings singleafter
 headings.@refill
 You can also specify your own style of page heading and footing.
 @xref{Headings, , Page Headings}, for more information.@refill
+@node The Top Node, Software Copying Permissions, Titlepage & Copyright Page, Beginning a File
-@node The Top Node
+@comment  node-name,  next,  previous,  up
 @section The `Top' Node and Master Menu
 @cindex @samp{@r{Top}} node
 @cindex Master menu
 @cindex Node, `Top'
 @menu
 * Title of Top Node::           Sketch what the file is about.
 * Master Menu Parts::           A master menu has three or more parts.
 @end menu
+@node Title of Top Node, Master Menu Parts, The Top Node, The Top Node
-@node Title of Top Node
+@ifinfo
-@subsection `Top' Node Title
+@subheading `Top' Node Title
+@end ifinfo
 Sometimes, you will want to place an @code{@@top} sectioning command
 line containing the title of the document immediately after the
 @code{@@node Top} line (@pxref{makeinfo top command, , The @code{@@top}
 Sectioning Command}, for more information).@refill
 @example
 @group
 @dots{}
 @@end titlepage
-@@ifnottex
+@@ifinfo
 @@node Top, Copying, , (dir)
 @@top Texinfo
 Texinfo is a documentation system@dots{}
 @end group
 @group
 This is edition@dots{}
 @dots{}
-@@end ifnottex
+@@end ifinfo
 @end group
 @group
 @@menu
 * Copying::                 Texinfo is freely
 @cindex Ending a Texinfo file
 @cindex Texinfo file ending
 @cindex File ending
 @findex bye
-The end of a Texinfo file should include commands to create indices and
+The end of a Texinfo file should include the commands that create
-(usually) to generate detailed and summary tables of contents.  And it
+indices and generate detailed and summary tables of contents.
-must include the @code{@@bye} command that marks the last line processed
+And it must include the @code{@@bye} command that marks the last line
-by @TeX{}.@refill
+processed by @TeX{}.@refill
 @need 700
 For example:
 @example
 Texinfo file; those just cause the raw data for the index to be
 accumulated.  To generate an index, you must include the
 @code{@@printindex} command at the place in the document where you
 want the index to appear.  Also, as part of the process of creating a
 printed manual, you must run a program called @code{texindex}
-(@pxref{Hardcopy}) to sort the raw data to produce a sorted
+(@pxref{Format/Print Hardcopy}) to sort the raw data to produce a sorted
 index file.  The sorted index file is what is actually used to
 print the index.@refill
 Texinfo offers six different types of predefined index: the concept
 index, the function index, the variables index, the keystroke index, the
 @@comment      node-name, next,       previous, up
 @@unnumbered Concept Index
 @@printindex cp
 @end group
+@group
+@@summarycontents
+@@contents
+@@bye
+@end group
 @end smallexample
 @noindent
-Readers often prefer that the concept index come last in a book,
+(Readers often prefer that the concept index come last in a book,
-since that makes it easiest to find.  Having just one index helps
+since that makes it easiest to find.)@refill
-readers also, since then they have only one place to look
-(@pxref{synindex}).
+@ignore
+@c TeX can do sorting, just not conveniently enough to handle sorting
+@c Texinfo indexes. --karl, 5may97.
-@node Contents
+In @TeX{}, the @code{@@printindex} command needs a sorted index file
+to work from.  @TeX{} does not know how to do sorting; this is a
+deficiency.  @TeX{} writes output files of raw index data; use the
+@code{texindex} program to convert these files to sorted index files.
+(@xref{Format/Print Hardcopy}, for more information.)@refill
+@end ignore
+@node Contents, File End, Printing Indices & Menus, Ending a File
+@comment  node-name,  next,  previous,  up
 @section Generating a Table of Contents
 @cindex Table of contents
 @cindex Contents, Table of
-@cindex Short table of contents
 @findex contents
 @findex summarycontents
 @findex shortcontents
 The @code{@@chapter}, @code{@@section}, and other structuring commands
 supply the information to make up a table of contents, but they do not
-cause an actual table to appear in the manual.  To do this, you must use
+cause an actual table to appear in the manual.  To do this, you must
-the @code{@@contents} and/or @code{@@summarycontents} command(s).
+use the @code{@@contents} and @code{@@summarycontents}
+commands:@refill
 @table @code
 @item @@contents
 Generate a table of contents in a printed manual, including all
 chapters, sections, subsections, etc., as well as appendices and
 unnumbered chapters.  (Headings generated by the @code{@@heading}
-series of commands do not appear in the table of contents.)
+series of commands do not appear in the table of contents.)  The
+@code{@@contents} command should be written on a line by
+itself.@refill
 @item @@shortcontents
 @itemx @@summarycontents
 (@code{@@summarycontents} is a synonym for @code{@@shortcontents}; the
 two commands are exactly the same.)@refill
 Generate a short or summary table of contents that lists only the
 chapters (and appendices and unnumbered chapters).  Omit sections, subsections
 and subsubsections.  Only a long manual needs a short table
 of contents in addition to the full table of contents.@refill
+Write the @code{@@shortcontents} command on a line by itself right
+@emph{before} the @code{@@contents} command.@refill
 @end table
-Both contents commands should be written on a line by themselves.
+The table of contents commands automatically generate a chapter-like
-The contents commands automatically generate a chapter-like heading at
+heading at the top of the first table of contents page.  Write the table
-the top of the first table of contents page, so don't include any
+of contents commands at the very end of a Texinfo file, just before the
-sectioning command such as @code{@@unnumbered} before them.
+@code{@@bye} command, following any index sections---anything in the
+Texinfo file after the table of contents commands will be omitted from
+the table of contents.@refill
+When you print a manual with a table of contents, the table of
+contents are printed last and numbered with roman numerals.  You need
+to place those pages in their proper place, after the title page,
+yourself.  (This is the only collating you need to do for a printed
+manual.  The table of contents is printed last because it is generated
+after the rest of the manual is typeset.)@refill
+@need 700
+Here is an example of where to write table of contents commands:@refill
+@example
+@group
+@var{indices}@dots{}
+@@shortcontents
+@@contents
+@@bye
+@end group
+@end example
 Since an Info file uses menus instead of tables of contents, the Info
-formatting commands ignore the contents commands.  But the contents are
+formatting commands ignore the @code{@@contents} and
-included in plain text output (generated by @code{makeinfo --no-headers}).
+@code{@@shortcontents} commands.@refill
-The contents commands can be placed either at the very end of the file,
+@node File End,  , Contents, Ending a File
-after any indices (see the previous section) and just before the
+@comment  node-name,  next,  previous,  up
-@code{@@bye} (see the next section), or near the beginning of the file,
-after the @code{@@end titlepage} (@pxref{titlepage}).  The advantage to
-the former is that then the contents output is always up to date,
-because it reflects the processing just done.  The advantage to the
-latter is that the contents are printed in the proper place, thus you do
-not need to rearrange the DVI file with @command{dviselect} or shuffle
-paper.  However, contents commands at the beginning of the document are
-ignored when outputting to standard output.
-@findex setcontentsaftertitlepage
-@findex setshortcontentsaftertitlepage
-@cindex Contents, after title page
-@cindex Table of contents, after title page
-As an author, you can put the contents commands wherever you prefer.
-But if you are a user simply printing a manual, you may wish to print
-the contents after the title page even if the author put the contents
-commands at the end of the document (as is the case in most existing
-Texinfo documents).  You can do this by specifying
-@code{@@setcontentsaftertitlepage} and/or
-@code{@@setshortcontentsaftertitlepage}.  The first prints only the main
-contents after the @code{@@end titlepage}; the second prints both the
-short contents and the main contents.  In either case, any subsequent
-@code{@@contents} or @code{@@shortcontents} is ignored (unless no
-@code{@@end titlepage} is ever encountered).
-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
-without altering the source file at all.  For example:
-@example
-texi2dvi --texinfo=@@setshortcontentsaftertitlepage foo.texi
-@end example
-@node File End
 @section @code{@@bye} File Ending
 @findex bye
 An @code{@@bye} command terminates @TeX{} or Info formatting.  None of
 the formatting commands see any of the file following @code{@@bye}.
 manual; it is as if text after @code{@@bye} were within @code{@@ignore}
 @dots{} @code{@@end ignore}.  Also, you may follow the @code{@@bye} line
 with a local variables list.  @xref{Compile-Command, , Using Local
 Variables and the Compile Command}, for more information.@refill
+@node Structuring, Nodes, Ending a File, Top
-@node Structuring
+@comment  node-name,  next,  previous,  up
 @chapter Chapter Structuring
 @cindex Chapter structuring
 @cindex Structuring of chapters
 The @dfn{chapter structuring} commands divide a document into a hierarchy of
 * unnumberedsubsec appendixsubsec subheading::
 * subsubsection::               Commands for the lowest level sections.
 * Raise/lower sections::        How to change commands' hierarchical level.
 @end menu
+@node Tree Structuring, Structuring Command Types, Structuring, Structuring
-@node Tree Structuring
+@comment  node-name,  next,  previous,  up
 @section Tree Structure of Sections
 @cindex Tree structuring
 A Texinfo file is usually structured like a book with chapters,
 sections, subsections, and the like.  This structure can be visualized
 The chapter structuring commands are described in the sections that
 follow; the @code{@@node} and @code{@@menu} commands are described in
 following chapters. (@xref{Nodes}, and see @ref{Menus}.)@refill
+@node Structuring Command Types, makeinfo top, Tree Structuring, Structuring
-@node Structuring Command Types
+@comment  node-name,  next,  previous,  up
-@section Structuring Command Types
+@section Types of Structuring Commands
 The chapter structuring commands fall into four groups or series, each
 of which contains structuring commands corresponding to the
 hierarchical levels of chapters, sections, subsections, and
 subsubsections.@refill
 @code{@@chapter}, @code{@@unnumbered}, and @code{@@appendix} commands
 start new pages in the printed manual; the @code{@@heading} commands
 do not.@refill
 @end itemize
+@need 1000
 Here are the four groups of chapter structuring commands:@refill
-@multitable @columnfractions .19 .30 .29 .22
+@c Slightly different formatting for regular sized books and smallbooks.
+@ifset smallbook
-@item              @tab              @tab                @tab No new page
+@sp 1
-@item Numbered     @tab Unnumbered   @tab Lettered and numbered
+@tex
-@tab Unnumbered
+{\let\rm=\indrm \let\tt=\indtt
-@item In contents  @tab In contents  @tab In contents    @tab Not in contents
+\halign{\hskip\itemindent#\hfil&  \hskip.5em#\hfil&  \hskip.5em#\hfil&
-@item                 @tab @code{@@top}                 @tab
+\hskip.5em#\hfil\cr
-@tab @code{@@majorheading}
-@item @code{@@chapter}       @tab @code{@@unnumbered}          @tab @code{@@appendix}
+& & &                                                \rm No new pages\cr
-@tab @code{@@chapheading}
+\rm Numbered&    \rm Unnumbered&  \rm Lettered and numbered& \rm Unnumbered\cr
-@item @code{@@section}       @tab @code{@@unnumberedsec}       @tab @code{@@appendixsec}
+\rm In contents&  \rm In contents&  \rm In contents&  \rm Not in contents\cr
-@tab @code{@@heading}
-@item @code{@@subsection}    @tab @code{@@unnumberedsubsec}    @tab @code{@@appendixsubsec}
+& & & \cr
-@tab @code{@@subheading}
+&              \tt  @@top&            &               \tt @@majorheading\cr
-@item @code{@@subsubsection} @tab @code{@@unnumberedsubsubsec} @tab @code{@@appendixsubsubsec}
+\tt @@chapter& \tt @@unnumbered&    \tt @@appendix&     \tt @@chapheading\cr
-@tab @code{@@subsubheading}
+\tt @@section&   \tt @@unnumberedsec&   \tt @@appendixsec&   \tt @@heading\cr
-@end multitable
+\tt @@subsection&\tt @@unnumberedsubsec&\tt @@appendixsubsec&
+\tt @@subheading\cr
+\tt @@subsubsection& \tt @@unnumberedsubsubsec& \tt @@appendixsubsubsec&
-@node makeinfo top
+\tt @@subsubheading\cr}}
+@end tex
+@end ifset
+@ifclear smallbook
+@sp 1
+@tex
+\vbox{
+\halign{\hskip\itemindent\hskip.5em#\hfil&  \hskip.5em#\hfil&
+\hskip.5em#\hfil& \hskip.5em #\hfil\cr
+& & & \cr
+& & &                                                \rm No new pages\cr
+\rm Numbered&    \rm Unnumbered&  \rm Lettered and numbered& \rm Unnumbered\cr
+\rm In contents&  \rm In contents&  \rm In contents&  \rm Not in contents\cr
+& & & \cr
+&              \tt  @@top&            &               \tt @@majorheading\cr
+\tt @@chapter& \tt @@unnumbered&    \tt @@appendix&     \tt @@chapheading\cr
+\tt @@section&   \tt @@unnumberedsec&   \tt @@appendixsec&   \tt @@heading\cr
+\tt @@subsection&\tt @@unnumberedsubsec&\tt @@appendixsubsec&
+\tt @@subheading\cr
+\tt @@subsubsection& \tt @@unnumberedsubsubsec& \tt @@appendixsubsubsec&
+\tt @@subsubheading\cr}}
+@end tex
+@end ifclear
+@ifinfo
+@example
+@group
+@r{No new pages}
+@r{Numbered}       @r{Unnumbered}       @r{Lettered and numbered}  @r{Unnumbered}
+@r{In contents}    @r{In contents}          @r{In contents}        @r{Not in contents}
+@@top                                    @@majorheading
+@@chapter       @@unnumbered          @@appendix          @@chapheading
+@@section       @@unnumberedsec       @@appendixsec       @@heading
+@@subsection    @@unnumberedsubsec    @@appendixsubsec    @@subheading
+@@subsubsection @@unnumberedsubsubsec @@appendixsubsubsec @@subsubheading
+@end group
+@end example
+@end ifinfo
+@c Cannot line up columns properly inside of an example because of roman
+@c proportional fonts.
+@ignore
+@ifset smallbook
+@iftex
+@smallexample
+@group
+@r{No new pages}
+@r{Numbered}      @r{Unnumbered}       @r{Lettered and numbered}  @r{Unnumbered}
+@r{In contents}      @r{In contents}           @r{In contents}         @r{Not in contents}
+@@top                                    @@majorheading
+@@chapter       @@unnumbered          @@appendix          @@chapheading
+@@section       @@unnumberedsec       @@appendixsec       @@heading
+@@subsection    @@unnumberedsubsec    @@appendixsubsec    @@subheading
+@@subsubsection @@unnumberedsubsubsec @@appendixsubsubsec @@subsubheading
+@end group
+@end smallexample
+@end iftex
+@end ifset
+@ifclear smallbook
+@iftex
+@smallexample
+@group
+@r{No new pages}
+@r{Numbered}      @r{Unnumbered}       @r{Lettered and numbered}  @r{Unnumbered}
+@r{In contents}      @r{In contents}           @r{In contents}         @r{Not in contents}
+@@top                                    @@majorheading
+@@chapter       @@unnumbered          @@appendix          @@chapheading
+@@section       @@unnumberedsec       @@appendixsec       @@heading
+@@subsection    @@unnumberedsubsec    @@appendixsubsec    @@subheading
+@@subsubsection @@unnumberedsubsubsec @@appendixsubsubsec @@subsubheading
+@end group
+@end smallexample
+@end iftex
+@end ignore
+@node makeinfo top, chapter, Structuring Command Types, Structuring
+@comment  node-name,  next,  previous,  up
 @section @code{@@top}
 The @code{@@top} command is a special sectioning command that you use
 only after an @samp{@@node Top} line at the beginning of a Texinfo file.
-The @code{@@top} command tells the @code{makeinfo} formatter which node
+The @code{@@top} command tells the @code{makeinfo} formatter
-is the `Top' node, so it can use it as the root of the node tree if your
+which node is the `Top'
-manual uses implicit pointers.  It has the same typesetting effect as
+node.  It has the same typesetting effect as @code{@@unnumbered}
-@code{@@unnumbered} (@pxref{unnumbered & appendix, , @code{@@unnumbered}
+(@pxref{unnumbered & appendix, , @code{@@unnumbered}, @code{@@appendix}}).
-and @code{@@appendix}}).  For detailed information, see @ref{makeinfo
+For detailed information, see
-top command, , The @code{@@top} Command}.
+@ref{makeinfo top command, , The @code{@@top} Command}.@refill
-The @code{@@top} node and its menu (if any) is conventionally wrapped in
-an @code{@@ifnottex} conditional so that it will appear only in Info and
-HTML output, not @TeX{}.
 @node chapter, unnumbered & appendix, makeinfo top, Structuring
 @comment  node-name,  next,  previous,  up
 @section @code{@@chapter}
 @findex chapter
 to @code{@@unnumbered}, but centers its argument in the printed output.
 This kind of stylistic choice is not usually offered by Texinfo.
 @c but the Hacker's Dictionary wanted it ...
-@node unnumbered & appendix
+@node unnumbered & appendix, majorheading & chapheading, chapter, Structuring
-@section @code{@@unnumbered} and @code{@@appendix}
+@comment  node-name,  next,  previous,  up
+@section @code{@@unnumbered}, @code{@@appendix}
 @findex unnumbered
 @findex appendix
 Use the @code{@@unnumbered} command to create a chapter that appears
 in a printed manual without chapter numbers of any kind.  Use the
 An attempt to raise above `chapters' reproduces chapter commands; an
 attempt to lower below `subsubsections' reproduces subsubsection
 commands.
-@node Nodes
+@node Nodes, Menus, Structuring, Top
+@comment  node-name,  next,  previous,  up
 @chapter Nodes
 @dfn{Nodes} are the primary segments of a Texinfo file.  They do not
-themselves impose a hierarchical or any other kind of structure on a file.
+themselves impose a hierarchic or any other kind of structure on a file.
 Nodes contain @dfn{node pointers} that name other nodes, and can contain
 @dfn{menus} which are lists of nodes.  In Info, the movement commands
 can carry you to a pointed-to node or to a node listed in a menu.  Node
 pointers and menus provide structure for Info files just as chapters,
 sections, subsections, and the like, provide structure for printed
 @menu
 * Two Paths::                   Different commands to structure
 Info output and printed output.
 * Node Menu Illustration::      A diagram, and sample nodes and menus.
-* node::                        Creating nodes, in detail.
+* node::                        How to write a node, in detail.
-* makeinfo Pointer Creation::   Letting makeinfo determine node pointers.
+* makeinfo Pointer Creation::   How to create node pointers with @code{makeinfo}.
-* anchor::                      Defining arbitrary cross-reference targets.
 @end menu
+@node Two Paths, Node Menu Illustration, Nodes, Nodes
-@node Two Paths
+@ifinfo
-@section Two Paths
+@heading Two Paths
+@end ifinfo
 The node and menu commands and the chapter structuring commands are
-technically independent of each other:
+independent of each other:
 @itemize @bullet
 @item
 In Info, node and menu commands provide structure.  The chapter
 structuring commands generate headings with different kinds of
 information for cross references; they do nothing else.@refill
 @end itemize
 You can use node pointers and menus to structure an Info file any way
 you want; and you can write a Texinfo file so that its Info output has a
-different structure than its printed output.  However, virtually all
+different structure than its printed output.  However, most Texinfo
-Texinfo files are written such that the structure for the Info output
+files are written such that the structure for the Info output
-corresponds to the structure for the printed output.  It is neither
+corresponds to the structure for the printed output.  It is not
-convenient nor understandable to the reader to do otherwise.@refill
+convenient to do otherwise.@refill
 Generally, printed output is structured in a tree-like hierarchy in
 which the chapters are the major limbs from which the sections branch
 out.  Similarly, node pointers and menus are organized to create a
 matching structure in the Info output.@refill
+@node Node Menu Illustration, node, Two Paths, Nodes
-@node Node Menu Illustration
+@comment  node-name,  next,  previous,  up
 @section Node and Menu Illustration
 Here is a copy of the diagram shown earlier that illustrates a Texinfo
 file with three chapters, each of which contains two sections.@refill
-The ``root'' is at the top of the diagram and the ``leaves'' are at the
+Note that the ``root'' is at the top of the diagram and the ``leaves''
-bottom.  This is how such a diagram is drawn conventionally; it
+are at the bottom.  This is how such a diagram is drawn conventionally;
-illustrates an upside-down tree.  For this reason, the root node is
+it illustrates an upside-down tree.  For this reason, the root node is
 called the `Top' node, and `Up' node pointers carry you closer to the
 root.@refill
 @example
 @group
 |                  |                  |
 --------           --------           --------
 |        |         |        |         |        |
 Section  Section   Section  Section   Section  Section
 1.1      1.2       2.1      2.2       3.1      3.2
-@end group
-@end example
+@end group
+@end example
-The fully-written command to start Chapter 2 would be this:
+Write the beginning of the node for Chapter 2 like this:@refill
-@example
-@group
+@example
-@@node     Chapter 2,  Chapter 3, Chapter 1, Top
+@group
+@@node     Chapter 2,  Chapter 3, Chapter 1, top
 @@comment  node-name,  next,      previous,  up
 @end group
 @end example
 @noindent
-This @code{@@node} line says that the name of this node is ``Chapter
+This @code{@@node} line says that the name of this node is ``Chapter 2'', the
-2'', the name of the `Next' node is ``Chapter 3'', the name of the
+name of the `Next' node is ``Chapter 3'', the name of the `Previous'
-`Previous' node is ``Chapter 1'', and the name of the `Up' node is
+node is ``Chapter 1'', and the name of the `Up' node is ``Top''.
-``Top''.  You can omit writing out these node names if your document is
-hierarchically organized (@pxref{makeinfo Pointer Creation}), but the
-pointer relationships still obtain.
 @quotation
 @strong{Please Note:} `Next' refers to the next node at the same
 hierarchical level in the manual, not necessarily to the next node
 within the Texinfo file.  In the Texinfo file, the subsequent node may
-be at a lower level---a section-level node most often follows a
+be at a lower level---a section-level node may follow a chapter-level
-chapter-level node, for example.  `Next' and `Previous' refer to nodes
+node, and a subsection-level node may follow a section-level node.
-at the @emph{same} hierarchical level.  (The `Top' node contains the
+`Next' and `Previous' refer to nodes at the @emph{same} hierarchical
-exception to this rule.  Since the `Top' node is the only node at that
+level.  (The `Top' node contains the exception to this rule.  Since the
-level, `Next' refers to the first following node, which is almost always
+`Top' node is the only node at that level, `Next' refers to the first
-a chapter or chapter-level node.)@refill
+following node, which is almost always a chapter or chapter-level
+node.)@refill
 @end quotation
 To go to Sections 2.1 and 2.2 using Info, you need a menu inside Chapter
 2.  (@xref{Menus}.)  You would write the menu just
 before the beginning of Section 2.1, like this:@refill
 @@cindex Texinfo file ending
 @@cindex File ending
 @end group
 @end example
+@node node, makeinfo Pointer Creation, Node Menu Illustration, Nodes
-@node node
+@comment  node-name,  next,  previous,  up
 @section The @code{@@node} Command
 @cindex Node, defined
-@findex node
 A @dfn{node} is a segment of text that begins at an @code{@@node}
 command and continues until the next @code{@@node} command.  The
 definition of node is different from that for chapter or section.  A
 chapter may contain sections and a section may contain subsections;
 but a node cannot contain subnodes; the text of a node continues only
 contain any number of nodes.  Indeed, a chapter usually contains
 several nodes, one for each section, subsection, and
 subsubsection.@refill
 To create a node, write an @code{@@node} command at the beginning of a
-line, and follow it with up to four arguments, separated by commas, on
+line, and follow it with four arguments, separated by commas, on the
-the rest of the same line.  The first argument is required; it is the
+rest of the same line.  These arguments are the name of the node, and
-name of this node.  The subsequent arguments are the names of the
+the names of the `Next', `Previous', and `Up' pointers, in that order.
-`Next', `Previous', and `Up' pointers, in that order, and may be omitted
+You may insert spaces before each pointer if you wish; the spaces are
-if your Texinfo document is hierarchically organized (@pxref{makeinfo
+ignored.  You must write the name of the node, and the names of the
-Pointer Creation}).
+`Next', `Previous', and `Up' pointers, all on the same line.  Otherwise,
-You may insert spaces before each name if you wish; the spaces are
-ignored.  You must write the name of the node and the names of the
-`Next', `Previous', and `Up' pointers all on the same line.  Otherwise,
 the formatters fail.  (@inforef{Top, info, info}, for more information
-about nodes in Info.)
+about nodes in Info.)@refill
 Usually, you write one of the chapter-structuring command lines
 immediately after an @code{@@node} line---for example, an
 @code{@@section} or @code{@@subsection} line.  (@xref{Structuring
-Command Types}.)
+Command Types, , Types of Structuring Commands}.)@refill
 @quotation
 @strong{Please note:} The GNU Emacs Texinfo mode updating commands work
 only with Texinfo files in which @code{@@node} lines are followed by chapter
 structuring lines.  @xref{Updating Requirements}.@refill
 @TeX{} uses @code{@@node} lines to identify the names to use for cross
 references.  For this reason, you must write @code{@@node} lines in a
 Texinfo file that you intend to format for printing, even if you do not
 intend to format it for Info.  (Cross references, such as the one at the
-end of this sentence, are made with @code{@@xref} and related commands;
+end of this sentence, are made with @code{@@xref} and its related
-see @ref{Cross References}.)@refill
+commands; see @ref{Cross References}.)@refill
 @menu
 * Node Names::                  How to choose node and pointer names.
 * Writing a Node::              How to write an @code{@@node} line.
 * Node Line Tips::              Keep names short.
 * First Node::                  How to write a `Top' node.
 * makeinfo top command::        How to use the @code{@@top} command.
 * Top Node Summary::            Write a brief description for readers.
 @end menu
+@node Node Names, Writing a Node, node, node
-@node Node Names
+@ifinfo
-@subsection Choosing Node and Pointer Names
+@subheading Choosing Node and Pointer Names
+@end ifinfo
-@cindex Node names, choosing
 The name of a node identifies the node.  The pointers enable
 you to reach other nodes and consist of the names of those nodes.@refill
 Normally, a node's `Up' pointer contains the name of the node whose menu
 mentions that node.  The node's `Next' pointer contains the name of the
 The `Top' node itself contains the main or master menu for the manual.
 Also, it is helpful to include a brief description of the manual in the
 `Top' node.  @xref{First Node}, for information on how to write the
 first node of a Texinfo file.@refill
-Even when you explicitly specify all pointers, that does not mean you
+@node Writing a Node, Node Line Tips, Node Names, node
-can write the nodes in the Texinfo source file in an arbitrary order!
+@comment  node-name,  next,  previous,  up
-Because @TeX{} processes the file sequentially, irrespective of node
-pointers, you must write the nodes in the order you wish them to appear
-in the printed output.
-@node Writing a Node
 @subsection How to Write an @code{@@node} Line
 @cindex Writing an @code{@@node} line
 @cindex @code{@@node} line writing
 @cindex Node line writing
 @samp{@@node} and a comment line listing the names of the pointers in
 their proper order.  The comment line helps you keep track of which
 arguments are for which pointers.  This comment line is especially useful
 if you are not familiar with Texinfo.@refill
-The template for a fully-written-out node line with `Next', `Previous',
+The template for a node line with `Next', `Previous', and `Up' pointers
-and `Up' pointers looks like this:@refill
+looks like this:@refill
 @example
 @@node @var{node-name}, @var{next}, @var{previous}, @var{up}
 @end example
 If you wish, you can ignore @code{@@node} lines altogether in your first
 draft and then use the @code{texinfo-insert-node-lines} command to
-create @code{@@node} lines for you.  However, we do not recommend this
+create @code{@@node} lines for you.  However, we do not
-practice.  It is better to name the node itself at the same time that
+recommend this practice.  It is better to name the node itself
-you write a segment so you can easily make cross references.  A large
+at the same time that you
-number of cross references are an especially important feature of a good
+write a segment so you can easily make cross references.  A large number
-Info file.
+of cross references are an especially important feature of a good Info
+file.@refill
 After you have inserted an @code{@@node} line, you should immediately
 write an @@-command for the chapter or section and insert its name.
 Next (and this is important!), put in several index entries.  Usually,
 you will find at least two and often as many as four or five ways of
 referring to the node in the index.  Use them all.  This will make it
-much easier for people to find the node.
+much easier for people to find the node.@refill
+@node Node Line Tips, Node Line Requirements, Writing a Node, node
-@node Node Line Tips
+@comment  node-name,  next,  previous,  up
 @subsection @code{@@node} Line Tips
 Here are three suggestions:
 @itemize @bullet
 By convention, node names are capitalized just as they would be for
 section or chapter titles---initial and significant words are
 capitalized; others are not.@refill
 @end itemize
 @node Node Line Requirements, First Node, Node Line Tips, node
+@comment  node-name,  next,  previous,  up
 @subsection @code{@@node} Line Requirements
 @cindex Node line requirements
 Here are several requirements for @code{@@node} lines:
 @itemize @bullet
 @cindex Unique nodename requirement
-@cindex Node name must be unique
+@cindex Nodename must be unique
 @item
 All the node names for a single Info file must be unique.@refill
 Duplicates confuse the Info movement commands.  This means, for
 example, that if you end every chapter with a summary, you must name
 @item
 A pointer name must be the name of a node.@refill
 The node to which a pointer points may come before or after the
-node containing the pointer.
+node containing the pointer.@refill
-@cindex @@-commands in nodename
+@cindex @@-command in nodename
-@cindex Node name, should not contain @@-commands
+@cindex Nodename, cannot contain
 @item
-@w{@@-commands} used in node names generally confuse Info, so you should
+You cannot use any of the Texinfo @@-commands in a node name;
-avoid them.  For a few rare cases when this is useful, Texinfo has
+@w{@@-commands} confuse Info.@refill
-limited support for using @w{@@-commands} in node names; see
-@ref{Pointer Validation}.
 @need 750
 Thus, the beginning of the section called @code{@@chapter} looks like
 this:@refill
 @@section @@code@{@@@@chapter@}
 @@findex chapter
 @end group
 @end smallexample
+@cindex Comma in nodename
+@cindex Apostrophe in nodename
 @item
-@cindex Apostrophe in nodename
+You cannot use commas or apostrophes within a node name; these
-@cindex Colon in nodename
+confuse @TeX{} or the Info formatters.@refill
-@cindex Comma in nodename
-@cindex Period in nodename
-@cindex Characters, invalid in node name
-@cindex Invalid characters in node names
-Unfortunately, you cannot use periods, commas, colons or apostrophes
-within a node name; these confuse @TeX{} or the Info formatters.@refill
 @need 700
 For example, the following is a section title:
 @smallexample
 frequently than the program or is independent of it, you should also
 include an edition number for the manual.  (The title page should also
 contain this information: see @ref{titlepage, ,
 @code{@@titlepage}}.)@refill
-@node makeinfo Pointer Creation
+@node makeinfo Pointer Creation,  , node, Nodes
 @section Creating Pointers with @code{makeinfo}
 @cindex Creating pointers with @code{makeinfo}
 @cindex Pointer creation with @code{makeinfo}
 @cindex Automatic pointer creation with @code{makeinfo}
-The @code{makeinfo} program has a feature for automatically defining
+The @code{makeinfo} program has a feature for automatically creating
-node pointers for a hierarchically organized file.
+node pointers for a hierarchically organized file that lacks
+them.@refill
 When you take advantage of this feature, you do not need to write the
 `Next', `Previous', and `Up' pointers after the name of a node.
 However, you must write a sectioning command, such as @code{@@chapter}
 or @code{@@section}, on the line immediately following each truncated
-@code{@@node} line (except that comment lines may intervene).
+@code{@@node} line.  You cannot write a comment line after a node
+line; the section line must follow it immediately.@refill
-In addition, you must follow the `Top' @code{@@node} line with a line
-beginning with @code{@@top} to mark the `Top' node in the
+In addition, you must follow the `Top' @code{@@node} line with a line beginning
-file.  @xref{makeinfo top, , @code{@@top}}.
+with @code{@@top} to mark the `Top' node in the file. @xref{makeinfo
+top, , @code{@@top}}.
 Finally, you must write the name of each node (except for the `Top'
 node) in a menu that is one or more hierarchical levels above the
-node's hierarchical level.
+node's hierarchical level.@refill
-This node pointer insertion feature in @code{makeinfo} relieves you from
+This node pointer insertion feature in @code{makeinfo} is an
-the need to update menus and pointers manually or with Texinfo mode
+alternative to the menu and pointer creation and update commands in
-commands.  (@xref{Updating Nodes and Menus}.)
+Texinfo mode.  (@xref{Updating Nodes and Menus}.)  It is especially
+helpful to people who do not use GNU Emacs for writing Texinfo
+documents.@refill
-@node anchor
-@section @code{@@anchor}: Defining Arbitrary Cross-reference Targets
+@node Menus, Cross References, Nodes, Top
+@comment  node-name,  next,  previous,          up
-@findex anchor
-@cindex Anchors
-@cindex Cross-reference targets, arbitrary
-@cindex Targets for cross-references, arbitrary
-An @dfn{anchor} is a position in your document, labeled so that
-cross-references can refer to it, just as they can to nodes.  You create
-an anchor with the @code{@@anchor} command, and give the label as a
-normal brace-delimited argument.  For example:
-@example
-This marks the @@anchor@{x-spot@}spot.
-@dots{}
-@@xref@{x-spot,,the spot@}.
-@end example
-@noindent produces:
-@example
-This marks the spot.
-@dots{}
-See [the spot], page 1.
-@end example
-As you can see, the @code{@@anchor} command itself produces no output.
-This example defines an anchor `x-spot' just before the word `spot'.
-You can refer to it later with an @code{@@xref} or other cross-reference
-command, as shown.  @xref{Cross References}, for details on the
-cross-reference commands.
-It is best to put @code{@@anchor} commands just before the position you
-wish to refer to; that way, the reader's eye is led on to the correct
-text when they jump to the anchor.  You can put the @code{@@anchor}
-command on a line by itself if that helps readability of the source.
-Spaces are always ignored after @code{@@anchor}.
-Anchor names and node names may not conflict.  Anchors and nodes are
-given similar treatment in some ways; for example, the @code{goto-node}
-command in standalone Info takes either an anchor name or a node name as
-an argument.  (@xref{goto-node,,,info-stnd,GNU Info}.)
-@node Menus
 @chapter Menus
 @cindex Menus
 @findex menu
-@dfn{Menus} contain pointers to subordinate nodes.@footnote{Menus can
+@dfn{Menus} contain pointers to subordinate
-carry you to any node, regardless of the hierarchical structure; even to
+nodes.@footnote{Menus can carry you to any node, regardless
-nodes in a different Info file.  However, the GNU Emacs Texinfo mode
+of the hierarchical structure; even to nodes in a different
-updating commands work only to create menus of subordinate nodes.
+Info file.  However, the GNU Emacs Texinfo mode updating
-Conventionally, cross references are used to refer to other nodes.} In
+commands work only to create menus of subordinate nodes.
-Info, you use menus to go to such nodes.  Menus have no effect in
+Conventionally, cross references are used to refer to other
-printed manuals and do not appear in them.
+nodes.} In Info, you use menus to go to such nodes.  Menus
+have no effect in printed manuals and do not appear in
+them.@refill
 By convention, a menu is put at the end of a node since a reader who
-uses the menu may not see text that follows it.  Furthermore, a node
+uses the menu may not see text that follows it.@refill
-that has a menu should not contain much text. If you have a lot of text
-and a menu, move most of the text into a new subnode---all but a few
+@ifinfo
-lines.  Otherwise, a reader with a terminal that displays only a few
+A node that has a menu should @emph{not} contain much text.  If you
-lines may miss the menu and its associated text.  As a practical matter,
+have a lot of text and a menu, move most of the text into a new
-you should locate a menu within 20 lines of the beginning of the
+subnode---all but a few lines.@refill
-node.
+@end ifinfo
+@iftex
+@emph{A node that has a menu should not contain much text.} If you
+have a lot of text and a menu, move most of the text into a new
+subnode---all but a few lines.  Otherwise, a reader with a terminal
+that displays only a few lines may miss the menu and its associated
+text.  As a practical matter, you should locate a menu within 20 lines
+of the beginning of the node.@refill
+@end iftex
 @menu
 * Menu Location::               Put a menu in a short node.
 * Writing a Menu::              What is a menu?
 * Menu Parts::                  A menu entry has three parts.
 * Less Cluttered Menu Entry::   Two part menu entry.
 * Menu Example::                Two and three part menu entries.
 * Other Info Files::            How to refer to a different Info file.
 @end menu
 @node Menu Location, Writing a Menu, Menus, Menus
 @ifinfo
 @heading Menus Need Short Nodes
 @end ifinfo
 @cindex Menu location
 @cindex Location of menus
 @cindex Nodes for menus are short
 @cindex Short nodes for menus
+@ifinfo
+A reader can easily see a menu that is close to the beginning of the
+node.  The node should be short.  As a practical matter, you should
+locate a menu within 20 lines of the beginning of the node.
+Otherwise, a reader with a terminal that displays only a few lines may
+miss the menu and its associated text.@refill
+@end ifinfo
 The short text before a menu may look awkward in a printed manual.  To
 avoid this, you can write a menu near the beginning of its node and
 follow the menu by an @code{@@node} line, and then an @code{@@heading}
 line located within @code{@@ifinfo} and @code{@@end ifinfo}.  This way,
 @end group
 @end example
 The Texinfo file for this document contains more than a dozen
 examples of this procedure.  One is at the beginning of this chapter;
-another is at the beginning of @ref{Cross References}. @refill
+another is at the beginning of the ``Cross References'' chapter.@refill
 @node Writing a Menu, Menu Parts, Menu Location, Menus
 @section Writing a Menu
 @cindex Writing a menu
 @cindex Menu writing
 several files at once.
 @@end menu
 @end group
 @end example
-In a menu, every line that begins with an @w{@samp{* }} is a @dfn{menu
+In a menu, every line that begins with an @w{@samp{* }} is a
-entry}.  (Note the space after the asterisk.)  A line that does not
+@dfn{menu entry}.  (Note the space after the asterisk.)  A
-start with an @w{@samp{* }} may also appear in a menu.  Such a line is
+line that does not start with an @w{@samp{* }} may also
-not a menu entry but is a menu comment line that appears in the Info
+appear in a menu.  Such a line is not a menu entry but is a
-file.  In the example above, the line @samp{Larger Units of Text} is a
+menu comment line that appears in the Info file.  In
-menu comment line; the two lines starting with @w{@samp{* }} are menu
+the example above, the line @samp{Larger Units of Text} is a
-@cindex Spaces, in menus
+menu comment line; the two lines starting with @w{@samp{* }}
-entries.  Space characters in a menu are preserved as-is; this allows
+are menu entries.
-you to format the menu as you wish.
 @node Menu Parts, Less Cluttered Menu Entry, Writing a Menu, Menus
 @section The Parts of a Menu
 @cindex Parts of a menu
 @cindex Menu parts
 @noindent
 (The @file{dir} top level directory for the Info system is an Info file,
 not a Texinfo file, but a menu entry looks the same in both types of
 file.)@refill
-The GNU Emacs Texinfo mode menu updating commands only work with nodes
+Note that the GNU Emacs Texinfo mode menu updating commands only work
-within the current buffer, so you cannot use them to create menus that
+with nodes within the current buffer, so you cannot use them to create
-refer to other files.  You must write such menus by hand.
+menus that refer to other files.  You must write such menus by hand.@refill
+@node Cross References, Marking Text, Menus, Top
-@node Cross References
+@comment  node-name,  next,  previous,  up
 @chapter Cross References
 @cindex Making cross references
 @cindex Cross references
 @cindex References
 @dfn{Cross references} are used to refer the reader to other parts of the
-same or different Texinfo files.  In Texinfo, nodes and anchors are the
+same or different Texinfo files.  In Texinfo, nodes are the
-places to which cross references can refer.
+places to which cross references can refer.@refill
 @menu
 * References::                  What cross references are for.
 * Cross Reference Commands::    A summary of the different commands.
 * Cross Reference Parts::       A cross reference has several parts.
 to find information that should be presented to them as they need
 it.@refill
 However, in any document, some information will be too detailed for
 the current context, or incidental to it; use cross references to
-provide access to such information.  Also, an online help system or a
+provide access to such information.  Also, an on-line help system or a
 reference manual is not like a novel; few read such documents in
 sequence from beginning to end.  Instead, people look up what they
 need.  For this reason, such creations should contain many cross
 references to help readers find other information that they may not
 have read.@refill
 In Info, a cross reference results in an entry that you can follow using
 the Info @samp{f} command.  (@inforef{Help-Adv, Some advanced Info
 commands, info}.)@refill
-The various cross reference commands use nodes (or anchors,
+The various cross reference commands use nodes to define cross
-@pxref{anchor,,@code{@@anchor}}) to define cross reference locations.
+reference locations.  This is evident in Info, in which a cross
-This is evident in Info, in which a cross reference takes you to the
+reference takes you to the specified node.  @TeX{} also uses nodes to
-specified location.  @TeX{} also uses nodes to define cross reference
+define cross reference locations, but the action is less obvious.  When
-locations, but the action is less obvious.  When @TeX{} generates a DVI
+@TeX{} generates a DVI file, it records nodes' page numbers and
-file, it records each node's page number and uses the page numbers in making
+uses the page numbers in making references.  Thus, if you are writing
-references.  Thus, if you are writing a manual that will only be
+a manual that will only be printed, and will not be used on-line, you
-printed, and will not be used online, you must nonetheless write
+must nonetheless write @code{@@node} lines to name the places to which
-@code{@@node} lines to name the places to which you make cross
+you make cross references.@refill
-references.@refill
 @need 800
 @node Cross Reference Commands, Cross Reference Parts, References, Cross References
 @comment  node-name,  next,  previous,  up
 @section Different Cross Reference Commands
 The five possible arguments for a cross reference are:@refill
 @enumerate
 @item
-The node or anchor name (required).  This is the location to which the
+The node name (required).  This is the node to which the
 cross reference takes you.  In a printed document, the location of the
 node provides the page reference only for references within the same
 document.@refill
 @item
 @end example
 @noindent
 In @TeX{}, a cross reference looks like this:
-@quotation
+@example
 See Section @var{section-number} [@var{node-name}], page @var{page}.
-@end quotation
+@end example
 @noindent
 or like this
-@quotation
+@example
 See Section @var{section-number} [@var{title-or-topic}], page @var{page}.
-@end quotation
+@end example
 The @code{@@xref} command does not generate a period or comma to end
 the cross reference in either the Info file or the printed output.
 You must write that period or comma yourself; otherwise, Info will not
 recognize the end of the reference.  (The @code{@@pxref} command works
 @example
 *Note Tropical Storms::, for more info.
 @end example
-@noindent
-and
 @quotation
 See Section 3.1 [Tropical Storms], page 24, for more info.
 @end quotation
 @noindent
 See Section 5.2 [Electrical Effects], page 57.
 @end quotation
 @noindent
 (Note that in the preceding example the closing brace is followed by a
-period; and that the node name is printed, not the cross reference name.)
+period; and that the node name is printed, not the cross reference name.)@refill
 You can write a clause after the cross reference, like this:@refill
 @example
 @@xref@{Electrical Effects, Lightning@}, for more info.
 cross references into arguments according to the commas; a comma
 within a title or other section will divide it into two arguments.  In
 a reference, you need to write a title such as ``Clouds, Mist, and
 Fog'' without the commas.@refill
-Also, remember to write a comma or period after the closing brace of an
+Also, remember to write a comma or period after the closing brace of a
 @code{@@xref} to terminate the cross reference.  In the following
 examples, a clause follows a terminating comma.@refill
 @need 750
 @need 700
 @noindent
 For example,
-@cindex Hurricanes
 @example
 For more information, see @@ref@{Hurricanes@}.
 @end example
 @noindent
 produces
 @example
-For more information, see *Note Hurricanes::.
+For more information, see *Note Hurricanes.
 @end example
 @noindent
 and
 @need 800
 @noindent
 For example,
-@cindex Sea surges
 @example
 @group
 Sea surges are described in @@ref@{Hurricanes@}.
 @end group
 @end example
 @example
 Sea surges are described in *Note Hurricanes::.
 @end example
 @quotation
-@strong{Caution:} You @emph{must} write a period, comma, or right
+@strong{Caution:} You @emph{must} write a period or comma immediately
-parenthesis immediately after an @code{@@ref} command with two or more
+after an @code{@@ref} command with two or more arguments.  Otherwise,
-arguments.  Otherwise, Info will not find the end of the cross reference
+Info will not find the end of the cross reference entry and its
-entry and its attempt to follow the cross reference will fail.  As a
+attempt to follow the cross reference will fail.  As a general rule,
-general rule, you should write a period or comma after every
+you should write a period or comma after every @code{@@ref} command.
-@code{@@ref} command.  This looks best in both the printed and the Info
+This looks best in both the printed and the Info output.@refill
-output.@refill
 @end quotation
 @node pxref, inforef, ref, Cross References
 @comment  node-name,  next,  previous,  up
 @section @code{@@pxref}
 @noindent
 With one argument, a parenthetical cross reference looks like
 this:@refill
-@cindex Flooding
 @example
 @dots{} storms cause flooding (@@pxref@{Hurricanes@}) @dots{}
 @end example
 @need 800
 The converse of @code{@@inforef} is @code{@@cite}, which is used to
 refer to printed works for which no Info form exists.  @xref{cite, ,
 @code{@@cite}}.@refill
-@node uref
+@node uref,  , inforef, Cross References
-@section @code{@@uref@{@var{url}[, @var{text}][, @var{replacement}]@}}
+@section @code{@@uref@{@var{url}[, @var{displayed-text}]@}}
 @findex uref
 @cindex Uniform resource locator, referring to
 @cindex URL, referring to
-@cindex @code{href}, producing HTML
+@code{@@uref} produces a reference to a uniform resource locator (URL).
-@code{@@uref} produces a reference to a uniform resource locator (url).
+It takes one mandatory argument, the URL, and one optional argument, the
-It takes one mandatory argument, the url, and two optional arguments
+text to display (the default is the URL itself).  In HTML output,
-which control the text that is displayed.  In HTML output, @code{@@uref}
+@code{@@uref} produces a link you can follow.  For example:
-produces a link you can follow.
+@example
-The second argument, if specified, is the text to display (the default
+The official GNU ftp site is
-is the url itself); in Info and DVI output, but not in HTML output, the
+@@uref@{ftp://ftp.gnu.ai.mit.edu/pub/gnu@}
-url is also output.
+@end example
-@cindex Man page, reference to
+@noindent
-The third argument, on the other hand, if specified is also the text to
+produces (in text):
-display, but the url is @emph{not} output in any format.  This is useful
-when the text is already sufficiently referential, as in a man page.  If
-the third argument is given, the second argument is ignored.
-The simple one argument form, where the url is both the target and the
-text of the link:
-@example
-The official GNU ftp site is @@uref@{ftp://ftp.gnu.org/gnu@}.
-@end example
-@noindent produces:
 @display
-The official GNU ftp site is @uref{ftp://ftp.gnu.org/gnu}.
+The official GNU ftp site is
+@uref{ftp://ftp.gnu.ai.mit.edu/pub/gnu}
 @end display
+@noindent
-An example of the two-argument form:
+whereas
 @example
-The official @@uref@{ftp://ftp.gnu.org/gnu, GNU ftp site@} holds
+The official
-programs and texts.
+@@uref@{ftp://ftp.gnu.ai.mit.edu/pub/gnu,
-@end example
+GNU ftp site@} holds programs and texts.
+@end example
-@noindent produces:
+@noindent
+produces (in text):
 @display
-The official @uref{ftp://ftp.gnu.org/gnu, GNU ftp site} holds
+The official @uref{ftp://ftp.gnu.ai.mit.edu/pub/gnu, GNU ftp site} holds
 programs and texts.
 @end display
-@noindent that is, the Info output is this:
+@noindent
-@example
+and (in HTML):
-The official GNU ftp site (ftp://ftp.gnu.org/gnu) holds
+@example
-programs and texts.
+The official <A HREF="ftp://ftp.gnu.ai.mit.edu/pub/gnu">GNU ftp
-@end example
+site</A> holds programs and texts.
+@end example
-@noindent and the HTML output is this:
-@example
+To merely indicate a URL, use @code{@@url} (@pxref{url, @code{@@url}}).
-The official <a href="ftp://ftp.gnu.org/gnu">GNU ftp site</a> holds
-programs and texts.
-@end example
+@node Marking Text, Quotations and Examples, Cross References, Top
+@comment  node-name,  next,  previous,  up
-An example of the three-argument form:
-@example
-The @@uref@{http://example.org/man.cgi/1/ls,,ls(1)@} program @dots{}
-@end example
-@noindent produces:
-@display
-The @uref{http://example.org/man.cgi/1/ls,,ls(1)} program @dots{}
-@end display
-@noindent but with HTML:
-@example
-The <a href="http://example.org/man.cgi/1/ls">ls(1)</a> program @dots{}
-@end example
-To merely indicate a url without creating a link people can follow, use
-@code{@@url} (@pxref{url, @code{@@url}}).
-Some people prefer to display url's in the unambiguous format:
-@display
-<URL:http://@var{host}/@var{path}>
-@end display
-@noindent
-@cindex <URL: convention, not used
-You can use this form in the input file if you wish.  We feel it's not
-necessary to clutter up the output with the extra @samp{<URL:} and
-@samp{>}, since any software that tries to detect url's in text already
-has to detect them without the @samp{<URL:} to be useful.
-@node Marking Text
 @chapter Marking Words and Phrases
 @cindex Paragraph, marking text within
 @cindex Marking words and phrases
 @cindex Words and phrases, marking them
 @cindex Marking text within a paragraph
-@cindex Text, marking up
 In Texinfo, you can mark words and phrases in a variety of ways.
 The Texinfo formatters use this information to determine how to
 highlight the text.
 You can specify, for example, whether a word or phrase is a
 defining occurrence, a metasyntactic variable, or a symbol used in a
-program.  Also, you can emphasize text, in several different ways.
+program.  Also, you can emphasize text.@refill
 @menu
 * Indicating::                  How to indicate definitions, files, etc.
 * Emphasis::                    How to emphasize text.
 @end menu
 For example, in a printed manual,
 code is usually illustrated in a typewriter font;
 @code{@@code} tells @TeX{} to typeset this text in this font.  But it
 would be easy to change the way @TeX{} highlights code to use another
-font, and this change would not affect how keystroke examples are
+font, and this change would not effect how keystroke examples are
 highlighted.  If straight typesetting commands were used in the body
 of the file and you wanted to make a change, you would need to check
 every single occurrence to make sure that you were changing code and
 not something else that should not be changed.@refill
 @menu
 * Useful Highlighting::         Highlighting provides useful information.
-* code::                        Indicating program code.
+* code::                        How to indicate code.
-* kbd::                         Showing keyboard input.
+* kbd::                         How to show keyboard input.
-* key::                         Specifying keys.
+* key::                         How to specify keys.
-* samp::                        Showing a literal sequence of characters.
+* samp::                        How to show a literal sequence of characters.
-* var::                         Indicating metasyntactic variables.
+* var::                         How to indicate a metasyntactic variable.
-* env::                         Indicating environment variables.
+* file::                        How to indicate the name of a file.
-* file::                        Indicating file names.
+* dfn::                         How to specify a definition.
-* command::                     Indicating command names.
+* cite::                        How to refer to a book that is not in Info.
-* option::                      Indicating option names.
+* url::                         How to indicate a world wide web reference.
-* dfn::                         Specifying definitions.
+* email::                       How to indicate an electronic mail address.
-* cite::                        Referring to books not in the  Info system.
-* acronym::                     Indicating acronyms.
-* url::                         Indicating a World Wide Web reference.
-* email::                       Indicating an electronic mail address.
 @end menu
 @node Useful Highlighting, code, Indicating, Indicating
 @ifinfo
 @subheading Highlighting Commands are Useful
 @end ifinfo
-The highlighting commands can be used to extract useful information
+The highlighting commands can be used to generate useful information
 from the file, such as lists of functions or file names.  It is
 possible, for example, to write a program in Emacs Lisp (or a keyboard
 macro) to insert an index entry after every paragraph that contains
 words or phrases marked by a specified command.  You could do this to
 construct an index of functions if you had not already made the
 Indicate text that is a literal example of a sequence of characters.@refill
 @item @@var@{@var{metasyntactic-variable}@}
 Indicate a metasyntactic variable.@refill
-@item @@env@{@var{environment-variable}@}
+@item @@url@{@var{uniform-resource-locator}@}
-Indicate an environment variable.@refill
+Indicate a uniform resource locator for the World Wide Web.
 @item @@file@{@var{file-name}@}
 Indicate the name of a file.@refill
-@item @@command@{@var{command-name}@}
+@item @@email@{@var{email-address}[, @var{displayed-text}]@}
-Indicate the name of a command.@refill
+Indicate an electronic mail address.
-@item @@option@{@var{option}@}
-Indicate a command-line option.@refill
 @item @@dfn@{@var{term}@}
 Indicate the introductory or defining use of a term.@refill
 @item @@cite@{@var{reference}@}
 Indicate the name of a book.@refill
-@item @@acronym@{@var{acronym}@}
-Indicate an acronym.@refill
-@item @@url@{@var{uniform-resource-locator}@}
-Indicate a uniform resource locator for the World Wide Web.
-@item @@email@{@var{email-address}[, @var{displayed-text}]@}
-Indicate an electronic mail address.
 @ignore
 @item @@ctrl@{@var{ctrl-char}@}
 Use for an @sc{ascii} control character.@refill
 @end ignore
 @end table
+@node code, kbd, Useful Highlighting, Indicating
-@node code
+@comment  node-name,  next,  previous,  up
 @subsection @code{@@code}@{@var{sample-code}@}
 @findex code
-@cindex Syntactic tokens, indicating
 Use the @code{@@code} command to indicate text that is a piece of a
 program and which consists of entire syntactic tokens.  Enclose the
-text in braces.
+text in braces.@refill
-@cindex Expressions in a program, indicating
-@cindex Keywords, indicating
-@cindex Reserved words, indicating
 Thus, you should use @code{@@code} for an expression in a program, for
 the name of a variable or function used in a program, or for a
-keyword in a programming language.
+keyword.  Also, you should use @code{@@code} for the name of a
+program, such as @code{diff}, that is a name used in the machine. (You
-Use @code{@@code} for command names in languages that resemble
+should write the name of a program in the ordinary text font if you
-programming languages, such as Texinfo.  For example, @code{@@code} and
+regard it as a new English word, such as `Emacs' or `Bison'.)@refill
-@code{@@samp} are produced by writing @samp{@@code@{@@@@code@}} and
-@samp{@@code@{@@@@samp@}} in the Texinfo source, respectively.
+Use @code{@@code} for environment variables such as @code{TEXINPUTS},
+and other variables.@refill
-@cindex Case, not altering in @code{@@code}
+Use @code{@@code} for command names in command languages that
+resemble programming languages, such as Texinfo or the shell.
+For example, @code{@@code} and @code{@@samp} are produced by writing
+@samp{@@code@{@@@@code@}} and @samp{@@code@{@@@@samp@}} in the Texinfo
+source, respectively.@refill
+Note, however, that you should not use @code{@@code} for shell options
+such as @samp{-c} when such options stand alone. (Use @code{@@samp}.)
+Also, an entire shell command often looks better if written using
+@code{@@samp} rather than @code{@@code}.  In this case, the rule is to
+choose the more pleasing format.@refill
 It is incorrect to alter the case of a word inside an @code{@@code}
 command when it appears at the beginning of a sentence.  Most computer
 languages are case sensitive.  In C, for example, @code{Printf} is
 different from the identifier @code{printf}, and most likely is a
 misspelling of it.  Even in languages which are not case sensitive, it
 is confusing to a human reader to see identifiers spelled in different
 ways.  Pick one spelling and always use that.  If you do not want to
-start a sentence with a command name written all in lower case, you
+start a sentence with a command written all in lower case, you should
-should rearrange the sentence.
+rearrange the sentence.@refill
+Do not use the @code{@@code} command for a string of characters shorter
+than a syntactic token.  If you are writing about @samp{TEXINPU}, which
+is just a part of the name for the @code{TEXINPUTS} environment
+variable, you should use @code{@@samp}.@refill
+In particular, you should not use the @code{@@code} command when writing
+about the characters used in a token; do not, for example, use
+@code{@@code} when you are explaining what letters or printable symbols
+can be used in the names of functions.  (Use @code{@@samp}.)  Also, you
+should not use @code{@@code} to mark text that is considered input to
+programs unless the input is written in a language that is like a
+programming language.  For example, you should not use @code{@@code} for
+the keystroke commands of GNU Emacs (use @code{@@kbd} instead) although
+you may use @code{@@code} for the names of the Emacs Lisp functions that
+the keystroke commands invoke.@refill
 In the printed manual, @code{@@code} causes @TeX{} to typeset the
 argument in a typewriter face.  In the Info file, it causes the Info
 formatting commands to use single quotation marks around the text.
 @need 700
 For example,
 @example
-The function returns @@code@{nil@}.
+Use @@code@{diff@} to compare two files.
 @end example
 @noindent
-produces this in the printed manual:
+produces this in the printed manual:@refill
 @quotation
-The function returns @code{nil}.
+Use @code{diff} to compare two files.
 @end quotation
 @iftex
-@noindent
-and this in the Info file:
+@noindent
-@example
+and this in the Info file:@refill
-The function returns `nil'.
+@example
+Use `diff' to compare two files.
 @end example
 @end iftex
-Here are some cases for which it is preferable not to use @code{@@code}:
+@node kbd, key, code, Indicating
-@itemize @bullet
-@item
-For shell command names such as @command{ls} (use @code{@@command}).
-@item
-For shell options such as @samp{-c} when such options stand alone (use
-@code{@@option}).
-@item
-Also, an entire shell command often looks better if written using
-@code{@@samp} rather than @code{@@code}.  In this case, the rule is to
-choose the more pleasing format.
-@item
-For environment variable such as @env{TEXINPUTS} (use @code{@@env}).
-@item
-For a string of characters shorter than a syntactic token.  For example,
-if you are writing about @samp{goto-ch}, which is just a part of the
-name for the @code{goto-char} Emacs Lisp function, you should use
-@code{@@samp}.
-@item
-In general, when writing about the characters used in a token; for
-example, do not use @code{@@code} when you are explaining what letters
-or printable symbols can be used in the names of functions.  (Use
-@code{@@samp}.)  Also, you should not use @code{@@code} to mark text
-that is considered input to programs unless the input is written in a
-language that is like a programming language.  For example, you should
-not use @code{@@code} for the keystroke commands of GNU Emacs (use
-@code{@@kbd} instead) although you may use @code{@@code} for the names
-of the Emacs Lisp functions that the keystroke commands invoke.
-@end itemize
-Since @code{@@command}, @code{@@option}, and @code{@@env} were
-introduced relatively recently, it is acceptable to use @code{@@code} or
-@code{@@samp} for command names, options, and environment variables.
-The new commands allow you to express the markup more precisely, but
-there is no real harm in using the older commands, and of course the
-long-standing manuals do so.
-@node kbd
 @subsection @code{@@kbd}@{@var{keyboard-characters}@}
 @findex kbd
-@cindex Keyboard input
+@cindex keyboard input
 Use the @code{@@kbd} command for characters of input to be typed by
 users.  For example, to refer to the characters @kbd{M-a},
 write@refill
 @item code
 Always use the same font for @code{@@kbd} as @code{@@code}.
 @item example
 Use the distinguishing font for @code{@@kbd} only in @code{@@example}
 and similar environments.
-@item distinct
+@item example
 (the default) Always use the distinguishing font for @code{@@kbd}.
 @end table
 You can embed another @@-command inside the braces of an @code{@@kbd}
 command.  Here, for example, is the way to describe a command that
 @samp{foo$}.@refill
 @end quotation
 Any time you are referring to single characters, you should use
 @code{@@samp} unless @code{@@kbd} or @code{@@key} is more appropriate.
-Also, you may use @code{@@samp} for entire statements in C and for entire
+Use @code{@@samp} for the names of command-line options (except in an
+@code{@@table}, where @code{@@code} seems to read more easily).  Also,
+you may use @code{@@samp} for entire statements in C and for entire
 shell commands---in this case, @code{@@samp} often looks better than
 @code{@@code}.  Basically, @code{@@samp} is a catchall for whatever is
 not covered by @code{@@code}, @code{@@kbd}, or @code{@@key}.@refill
 Only include punctuation marks within braces if they are part of the
 In English, the vowels are @samp{a}, @samp{e},
 @samp{i}, @samp{o}, @samp{u},  and sometimes
 @samp{y}.
 @end quotation
+@node var, file, samp, Indicating
-@node var
+@comment  node-name,  next,  previous,  up
 @subsection @code{@@var}@{@var{metasyntactic-variable}@}
 @findex var
 Use the @code{@@var} command to indicate metasyntactic variables.  A
 @dfn{metasyntactic variable} is something that stands for another piece of
 documentation of a function to describe the arguments that are passed
 to that function.@refill
 Do not use @code{@@var} for the names of particular variables in
 programming languages.  These are specific names from a program, so
-@code{@@code} is correct for them (@pxref{code}).  For example, the
+@code{@@code} is correct for them.  For example, the Emacs Lisp variable
-Emacs Lisp variable @code{texinfo-tex-command} is not a metasyntactic
+@code{texinfo-tex-command} is not a metasyntactic variable; it is
-variable; it is properly formatted using @code{@@code}.
+properly formatted using @code{@@code}.@refill
-Do not use @code{@@var} for environment variables either; @code{@@env}
+The effect of @code{@@var} in the Info file is to change the case of
-is correct for them (see the next section).
+the argument to all upper case; in the printed manual, to italicize it.
-The effect of @code{@@var} in the Info file is to change the case of the
-argument to all upper case.  In the printed manual and HTML output, the
-argument is printed in slanted type.
 @need 700
 For example,
 @example
 To delete file @@var@{filename@},
-type @@samp@{rm @@var@{filename@}@}.
+type @@code@{rm @@var@{filename@}@}.
 @end example
 @noindent
 produces
 @quotation
-To delete file @var{filename}, type @samp{rm @var{filename}}.
+To delete file @var{filename}, type @code{rm @var{filename}}.
 @end quotation
 @noindent
 (Note that @code{@@var} may appear inside @code{@@code},
 @code{@@samp}, @code{@@file}, etc.)@refill
 @dots{}, type rm <filename>
 @end example
 @noindent
 However, that is not the style that Texinfo uses.  (You can, of
-course, modify the sources to @file{texinfo.tex} and the Info formatting commands
+course, modify the sources to @TeX{} and the Info formatting commands
 to output the @code{<@dots{}>} format if you wish.)@refill
+@node file, dfn, var, Indicating
-@node env
+@comment  node-name,  next,  previous,  up
-@subsection @code{@@env}@{@var{environment-variable}@}
-@findex env
-Use the @code{@@env} command to indicate environment variables, as used
-by many operating systems, including GNU.  Do not use it for
-metasyntactic variables; use @code{@@var} instead (see the previous
-section).
-@code{@@env} is equivalent to @code{@@code} in its effects.
-For example:
-@example
-The @@env@{PATH@} environment variable sets the search path for commands.
-@end example
-@noindent produces
-@quotation
-The @env{PATH} environment variable sets the search path for commands.
-@end quotation
-@node file
 @subsection @code{@@file}@{@var{file-name}@}
 @findex file
 Use the @code{@@file} command to indicate text that is the name of a
 file, buffer, or directory, or is the name of a node in Info.  You can
 @quotation
 The @file{.el} files are in
 the @file{/usr/local/emacs/lisp} directory.
 @end quotation
+@node dfn, cite, file, Indicating
-@node command
-@subsection @code{@@command}@{@var{command-name}@}
-@findex command
-@cindex Command names, indicating
-@cindex Program names, indicating
-Use the @code{@@command} command to indicate command names, such as
-@command{ls} or @command{cc}.
-@code{@@command} is equivalent to @code{@@code} in its effects.
-For example:
-@example
-The command @@command@{ls@} lists directory contents.
-@end example
-@noindent produces
-@quotation
-The command @command{ls} lists directory contents.
-@end quotation
-You should write the name of a program in the ordinary text font, rather
-than using @code{@@command}, if you regard it as a new English word,
-such as `Emacs' or `Bison'.
-When writing an entire shell command invocation, as in @samp{ls -l},
-you should use either @code{@@samp} or @code{@@code} at your discretion.
-@node option
-@subsection @code{@@option}@{@var{option-name}@}
-@findex option
-Use the @code{@@option} command to indicate a command-line option; for
-example, @option{-l} or @option{--version} or
-@option{--output=@var{filename}}.
-@code{@@option} is equivalent to @code{@@samp} in its effects.
-For example:
-@example
-The option @@option@{-l@} produces a long listing.
-@end example
-@noindent produces
-@quotation
-The option @option{-l} produces a long listing.
-@end quotation
-In tables, putting options inside @code{@@code} produces a
-more pleasing effect.
-@node dfn
 @comment  node-name,  next,  previous,  up
 @subsection @code{@@dfn}@{@var{term}@}
 @findex dfn
 Use the @code{@@dfn} command to identify the introductory or defining
 As a general rule, a sentence containing the defining occurrence of a
 term should be a definition of the term.  The sentence does not need
 to say explicitly that it is a definition, but it should contain the
 information of a definition---it should make the meaning clear.
-@node cite
+@node cite, url, dfn, Indicating
+@comment  node-name,  next,  previous,  up
 @subsection @code{@@cite}@{@var{reference}@}
 @findex cite
 Use the @code{@@cite} command for the name of a book that lacks a
-companion Info file.  The command produces italics in the printed
+companion Info file. The command produces italics in the printed
-manual, and quotation marks in the Info file.
+manual, and quotation marks in the Info file.@refill
-If a book is written in Texinfo, it is better to use a cross reference
+(If a book is written in Texinfo, it is better to use a cross reference
 command since a reader can easily follow such a reference in Info.
-@xref{xref, , @code{@@xref}}.
+@xref{xref, , @code{@@xref}}.)@refill
 @ignore
 @c node ctrl, , cite, Indicating
 @comment  node-name,  next,  previous,  up
 @c subsection @code{@@ctrl}@{@var{ctrl-char}@}
 identify that control character: an uparrow followed by the character
 @var{ch}.@refill
 @end ignore
-@node acronym
+@node url, email, cite, Indicating
-@subsection @code{@@acronym}@{@var{acronym}@}
-@findex acronym
-@cindex NASA, as acronym
-@cindex F.B.I., as acronym
-@cindex Abbreviations, tagging
-@cindex Acronyms, tagging
-Use the @code{@@acronym} command for abbreviations written in all
-capital letters, such as `@acronym{NASA}'.  The abbreviation is given as
-the single argument in braces, as in @samp{@@acronym@{NASA@}}.  As
-a matter of style, or for particular abbreviations, you may prefer to
-use periods, as in @samp{@@acronym@{F.B.I.@}}.
-In @TeX{} and HTML, the argument is printed in a slightly smaller font
-size.  In Info or plain text output, this command changes nothing.
-@node url
 @subsection @code{@@url}@{@var{uniform-resource-locator}@}
 @findex url
 @cindex Uniform resource locator, indicating
 @cindex URL, indicating
-Use the @code{@@url} command to indicate a uniform resource locator on
+Use the @code{@@url} to indicate a uniform resource locator on the World
-the World Wide Web.  This is analogous to @code{@@file}, @code{@@var},
+Wide Web.  This is analogous to @code{@@file}, @code{@@var}, etc., and
-etc., and is purely for markup purposes.  It does not produce a link you
+is purely for markup purposes.  It does not produce a link you can
-can follow in HTML output (use the @code{@@uref} command for that,
+follow in HTML output (the @code{@@uref} command does, @pxref{uref,,
-@pxref{uref,, @code{@@uref}}).  It is useful for url's which do
+@code{@@uref}}).  It is useful for example URL's which do not actually
-not actually exist.  For example:
+exist.  For example:
 @c Two lines because one is too long for smallbook format.
 @example
-For example, the url might be @@url@{http://example.org/path@}.
+For example, the url might be
-@end example
+@@url@{http://host.domain.org/path@}.
+@end example
-@noindent which produces:
-@display
+@node email,  , url, Indicating
-For example, the url might be @url{http://example.org/path}.
-@end display
-@node email
 @subsection @code{@@email}@{@var{email-address}[, @var{displayed-text}]@}
 @findex email
 Use the @code{@@email} command to indicate an electronic mail address.
 It takes one mandatory argument, the address, and one optional argument, the
 @example
 Send bug reports to @@email@{bug-texinfo@@@@gnu.org@}.
 Send suggestions to the @@email@{bug-texinfo@@@@gnu.org, same place@}.
 @end example
-@noindent produces
+@noindent
-@display
+produces
+@example
 Send bug reports to @email{bug-texinfo@@gnu.org}.
 Send suggestions to the @email{bug-texinfo@@gnu.org, same place}.
-@end display
+@end example
 @node Emphasis,  , Indicating, Marking Text
 @comment node-name,  next,  previous,  up
 @section Emphasizing Text
 what category the words belong to; an example is the @code{@@code} command.
 Most often, this is the best way to mark words.
 However, sometimes you will want to emphasize text without indicating a
 category.  Texinfo has two commands to do this.  Also, Texinfo has
 several commands that specify the font in which @TeX{} will typeset
-text.  These commands have no effect on Info and only one of them,
+text.  These commands have no affect on Info and only one of them,
 the @code{@@r} command, has any regular use.@refill
 @menu
 * emph & strong::               How to emphasize text in Texinfo.
 * Smallcaps::                   How to use the small caps font.
 * Fonts::                       Various font commands for printed output.
+* Customized Highlighting::     How to define highlighting commands.
 @end menu
-@node emph & strong
+@node emph & strong, Smallcaps, Emphasis, Emphasis
+@comment  node-name,  next,  previous,  up
 @subsection @code{@@emph}@{@var{text}@} and @code{@@strong}@{@var{text}@}
 @cindex Emphasizing text, font for
 @findex emph
 @findex strong
 The @code{@@emph} and @code{@@strong} commands are for emphasis;
-@code{@@strong} is stronger.  In printed output, @code{@@emph} produces
+@code{@@strong} is stronger.  In printed output, @code{@@emph}
-@emph{italics} and @code{@@strong} produces @strong{bold}.
+produces @emph{italics} and @code{@@strong} produces
+@strong{bold}.@refill
 @need 800
 For example,
 @example
 @iftex
 @noindent
 produces the following in printed output:
 @quotation
-@strong{Caution}: @samp{rm * .[^.]*} removes @emph{all}
+@strong{Caution}: @code{rm * .[^.]*} removes @emph{all}
 files in the directory.
 @end quotation
 @noindent
 and the following in Info:
 @noindent
 produces:
 @end ifinfo
 @example
-*Caution*: `rm * .[^.]*' removes _all_
+*Caution*: `rm * .[^.]*' removes *all*
 files in the directory.
 @end example
 The @code{@@strong} command is seldom used except to mark what is, in
 effect, a typographical element, such as the word `Caution' in the
 preceding example.
-In the Info output, @code{@@emph} surrounds the text with underscores
+In the Info file, both @code{@@emph} and @code{@@strong} put asterisks
-(@samp{_}), and @code{@@strong} puts asterisks around the text.
+around the text.@refill
 @quotation
-@strong{Caution:} Do not use @code{@@strong} with the word @samp{Note};
+@strong{Caution:} Do not use @code{@@emph} or @code{@@strong} with the
-Info will mistake the combination for a cross reference.  Use a phrase
+word @samp{Note}; Info will mistake the combination for a cross
-such as @strong{Please note} or @strong{Caution} instead.
+reference.  Use a phrase such as @strong{Please note} or
+@strong{Caution} instead.@refill
 @end quotation
+@node Smallcaps, Fonts, emph & strong, Emphasis
-@node Smallcaps
 @subsection @code{@@sc}@{@var{text}@}: The Small Caps Font
 @cindex Small caps font
 @findex sc @r{(small caps font)}
-Use the @samp{@@sc} command to set text in the printed and the HTML
+@iftex
-output in @sc{a small caps font} and set text in the Info file in upper
+Use the @samp{@@sc} command to set text in the printed output in @sc{a
-case letters.  Write the text you want to be in small caps (where
+small caps font} and set text in the Info file in upper case letters.@refill
-possible) between braces in lower case, like this:
+@end iftex
+@ifinfo
+Use the @samp{@@sc} command to set text in the printed output in a
+small caps font and set text in the Info file in upper case letters.@refill
+@end ifinfo
+Write the text between braces in lower case, like this:@refill
 @example
 The @@sc@{acm@} and @@sc@{ieee@} are technical societies.
 @end example
 The @sc{acm} and @sc{ieee} are technical societies.
 @end display
 @TeX{} typesets the small caps font in a manner that prevents the
 letters from `jumping out at you on the page'.  This makes small caps
-text easier to read than text in all upper case---but it's usually
+text easier to read than text in all upper case.  The Info formatting
-better to use regular mixed case anyway.  The Info formatting commands
+commands set all small caps text in upper case.@refill
-set all small caps text in upper case.  In HTML, the text is upper-cased
-and a smaller font is used to render it.
+@ifinfo
+If the text between the braces of an @code{@@sc} command is upper case,
-If the text between the braces of an @code{@@sc} command is uppercase,
+@TeX{} typesets in full-size capitals.  Use full-size capitals
-@TeX{} typesets in FULL-SIZE CAPITALS.  Use full-size capitals
+sparingly.@refill
-sparingly, if ever, and since it's redundant to mark all-uppercase text
+@end ifinfo
-with @code{@@sc}, @command{makeinfo} warns about such usage.
+@iftex
+If the text between the braces of an @code{@@sc} command is upper case,
+@TeX{} typesets in @sc{FULL-SIZE CAPITALS}.  Use full-size capitals
+sparingly.@refill
+@end iftex
 You may also use the small caps font for a jargon word such as
-@sc{ato} (a @sc{nasa} word meaning `abort to orbit').
+@sc{ato} (a @sc{nasa} word meaning `abort to orbit').@refill
 There are subtleties to using the small caps font with a jargon word
 such as @sc{cdr}, a word used in Lisp programming.  In this case, you
 should use the small caps font when the word refers to the second and
 subsequent elements of a list (the @sc{cdr} of the list), but you
 should use @samp{@@code} when the word refers to the Lisp function of
-the same spelling.
+the same spelling.@refill
+@node Fonts, Customized Highlighting, Smallcaps, Emphasis
-@node Fonts
+@comment node-name,  next,  previous,  up
 @subsection Fonts for Printing, Not Info
 @cindex Fonts for printing, not for Info
 @findex i @r{(italic font)}
 @findex b @r{(bold font)}
 @findex t @r{(typewriter font)}
 If possible, you should avoid using the other three font commands.  If
 you need to use one, it probably indicates a gap in the Texinfo
 language.@refill
-@node Quotations and Examples
+@node Customized Highlighting,  , Fonts, Emphasis
+@comment node-name,  next,  previous,  up
+@subsection Customized Highlighting
+@cindex Highlighting, customized
+@cindex Customized highlighting
+@c I think this whole section is obsolete with the advent of macros
+@c --karl, 15sep96.
+You can use regular @TeX{} commands inside of @code{@@iftex} @dots{}
+@code{@@end iftex} to create your own customized highlighting commands
+for Texinfo.  The easiest way to do this is to equate your customized
+commands with pre-existing commands, such as those for italics.  Such
+new commands work only with @TeX{}.@refill
+@findex definfoenclose
+@cindex Enclosure command for Info
+You can use the @code{@@definfoenclose} command inside of
+@code{@@ifinfo} @dots{} @code{@@end ifinfo} to define commands for Info
+with the same names as new commands for @TeX{}.
+@code{@@definfoenclose} creates new commands for Info that mark text by
+enclosing it in strings that precede and follow the text.
+@footnote{Currently, @code{@@definfoenclose} works only with
+@code{texinfo-format-buffer} and @code{texinfo-format-region}, not with
+@code{makeinfo}.}@refill
+Here is how to create a new @@-command called @code{@@phoo} that causes
+@TeX{} to typeset its argument in italics and causes Info to display the
+argument between @samp{//} and @samp{\\}.@refill
+@need 1300
+For @TeX{}, write the following to equate the @code{@@phoo} command with
+the existing @code{@@i} italics command:@refill
+@example
+@group
+@@iftex
+@@global@@let@@phoo=@@i
+@@end iftex
+@end group
+@end example
+@noindent
+This defines @code{@@phoo} as a command that causes @TeX{} to typeset
+the argument to @code{@@phoo} in italics.  @code{@@global@@let} tells
+@TeX{} to equate the next argument with the argument that follows the
+equals sign.
+@need 1300
+For Info, write the following to tell the Info formatters to enclose the
+argument between @samp{//} and @samp{\\}:
+@example
+@group
+@@ifinfo
+@@definfoenclose phoo, //, \\
+@@end ifinfo
+@end group
+@end example
+@noindent
+Write the @code{@@definfoenclose} command on a line and follow it with
+three arguments separated by commas (commas are used as separators in an
+@code{@@node} line in the same way).@refill
+@itemize @bullet
+@item
+The first argument to @code{@@definfoenclose} is the @@-command name
+@strong{without} the @samp{@@};
+@item
+the second argument is the Info start delimiter string; and,
+@item
+the third argument is the Info end delimiter string.
+@end itemize
+@noindent
+The latter two arguments enclose the highlighted text in the Info file.
+A delimiter string may contain spaces.  Neither the start nor end
+delimiter is required.  However, if you do not provide a start
+delimiter, you must follow the command name with two commas in a row;
+otherwise, the Info formatting commands will misinterpret the end
+delimiter string as a start delimiter string.@refill
+After you have defined @code{@@phoo} both for @TeX{} and for Info, you
+can then write @code{@@phoo@{bar@}} to see @samp{//bar\\}
+in Info and see
+@ifinfo
+@samp{bar} in italics in printed output.
+@end ifinfo
+@iftex
+@i{bar} in italics in printed output.
+@end iftex
+Note that each definition applies to its own formatter: one for @TeX{},
+the other for Info.
+@need 1200
+Here is another example:
+@example
+@group
+@@ifinfo
+@@definfoenclose headword, , :
+@@end ifinfo
+@@iftex
+@@global@@let@@headword=@@b
+@@end iftex
+@end group
+@end example
+@noindent
+This defines @code{@@headword} as an Info formatting command that
+inserts nothing before and a colon after the argument and as a @TeX{}
+formatting command to typeset its argument in bold.
+@node Quotations and Examples, Lists and Tables, Marking Text, Top
+@comment  node-name,  next,  previous,  up
 @chapter Quotations and Examples
 Quotations and examples are blocks of text consisting of one or more
 whole paragraphs that are set off from the bulk of the text and
 treated differently.  They are usually indented.@refill
 * Block Enclosing Commands::    Use different constructs for
 different purposes.
 * quotation::                   How to write a quotation.
 * example::                     How to write an example in a fixed-width font.
 * noindent::                    How to prevent paragraph indentation.
-* lisp::                        How to illustrate Lisp code.
+* Lisp Example::                How to illustrate Lisp code.
-* small::                       Forms for @code{@@smallbook}.
+* smallexample & smalllisp::    Forms for the @code{@@smallbook} option.
 * display::                     How to write an example in the current font.
 * format::                      How to write an example that does not narrow
 the margins.
 * exdent::                      How to undo the indentation of a line.
 * flushleft & flushright::      How to push text flushleft or flushright.
 * cartouche::                   How to draw cartouches around examples.
 @end menu
-@node Block Enclosing Commands
+@node Block Enclosing Commands, quotation, Quotations and Examples, Quotations and Examples
-@section Block Enclosing Commands
+@section The Block Enclosing Commands
-Here are commands for quotations and examples, explained further in the
+Here are commands for quotations and examples:@refill
-following sections:
 @table @code
 @item @@quotation
 Indicate text that is quoted. The text is filled, indented, and
 printed in a roman font by default.@refill
 @item @@example
 Illustrate code, commands, and the like. The text is printed
 in a fixed-width font, and indented but not filled.@refill
+@item @@lisp
+Illustrate Lisp code. The text is printed in a fixed-width font,
+and indented but not filled.@refill
 @item @@smallexample
-Same as @code{@@example}, except that in @TeX{} this command typesets
+Illustrate code, commands, and the like.  Similar to
-text in a smaller font for the @code{@@smallbook} format than for the
+@code{@@example}, except that in @TeX{} this command typesets text in
-default 8.5 by 11 inch format.
+a smaller font for the smaller @code{@@smallbook} format than for the
+8.5 by 11 inch format.@refill
-@item @@lisp
-Like @code{@@example}, but specifically for illustrating Lisp code. The
-text is printed in a fixed-width font, and indented but not filled.
 @item @@smalllisp
-Is to @code{@@lisp} as @code{@@smallexample} is to @code{@@example}.
+Illustrate Lisp code.  Similar to @code{@@lisp}, except that
+in @TeX{} this command typesets text in a smaller font for the smaller
+@code{@@smallbook} format than for the 8.5 by 11 inch format.@refill
 @item @@display
 Display illustrative text.  The text is indented but not filled, and
-no font is selected (so, by default, the font is roman).@refill
+no font is specified (so, by default, the font is roman).@refill
-@item @@smalldisplay
-Is to @code{@@display} as @code{@@smallexample} is to @code{@@example}.
 @item @@format
-Like @code{@@display} (the text is not filled and no font is selected),
+Print illustrative text.  The text is not indented and not filled
-but the text is not indented.
+and no font is specified (so, by default, the font is roman).@refill
-@item @@smallformat
-Is to @code{@@format} as @code{@@smallexample} is to @code{@@example}.
 @end table
 The @code{@@exdent} command is used within the above constructs to
 undo the indentation of a line.
 constructs to prevent the following text from being indented as a new
 paragraph.@refill
 You can use the @code{@@cartouche} command within one of the above
 constructs to highlight the example or quotation by drawing a box with
-rounded corners around it.  @xref{cartouche, , Drawing Cartouches Around
+rounded corners around it.  (The @code{@@cartouche} command affects
-Examples}.
+only the printed manual; it has no effect in the Info file; see
+@ref{cartouche, , Drawing Cartouches Around Examples}.)@refill
-@node quotation
+@node quotation, example, Block Enclosing Commands, Quotations and Examples
+@comment  node-name,  next,  previous,  up
 @section @code{@@quotation}
 @cindex Quotations
 @findex quotation
-The text of a quotation is processed normally except that:
+The text of a quotation is
+processed normally except that:@refill
 @itemize @bullet
 @item
 the margins are closer to the center of the page, so the whole of the
 quotation is indented;@refill
 @quotation
 This is a foo.
 @end quotation
+@node example, noindent, quotation, Quotations and Examples
-@node example
+@comment  node-name,  next,  previous,  up
 @section @code{@@example}
 @cindex Examples, formatting them
 @cindex Formatting examples
 @findex example
 obtained by indenting each line with five spaces.
 @end group
 @end example
 Write an @code{@@example} command at the beginning of a line by itself.
-Mark the end of the example
+This line will disappear from the output.  Mark the end of the example
 with an @code{@@end example} command, also written at the beginning of a
-line by itself.@refill
+line by itself.  The @code{@@end example} will disappear from the
+output.@refill
 @need 700
 For example,
 @example
 @example
 mv foo bar
 @end example
-The lines containing @code{@@example} and @code{@@end example}
+Since the lines containing @code{@@example} and @code{@@end example}
-will disappear from the output.
+will disappear, you should put a blank line before the
-To make the output look good,
+@code{@@example} and another blank line after the @code{@@end
-you should put a blank line before the
+example}.  (Remember that blank lines between the beginning
-@code{@@example} and another blank line after the @code{@@end example}.
-Note that blank lines inside the beginning
 @code{@@example} and the ending @code{@@end example} will appear in
-the output.@refill
+the output.)@refill
 @quotation
 @strong{Caution:} Do not use tabs in the lines of an example (or anywhere
 else in Texinfo, for that matter)!  @TeX{} treats tabs as single
 spaces, and that is not what they look like.  This is a problem with
 @TeX{}.  (If necessary, in Emacs, you can use @kbd{M-x untabify} to
 convert tabs in a region to multiple spaces.)@refill
 @end quotation
 Examples are often, logically speaking, ``in the middle'' of a
-paragraph, and the text that continues after an example should not be
+paragraph, and the text continues after an example should not be
 indented.  The @code{@@noindent} command prevents a piece of text from
 being indented as if it were a new paragraph.
 @ifinfo
 (@xref{noindent}.)
 @end ifinfo
 (The @code{@@code} command is used for examples of code that are
 embedded within sentences, not set off from preceding and following
 text.  @xref{code, , @code{@@code}}.)
+@node noindent, Lisp Example, example, Quotations and Examples
-@node noindent
+@comment  node-name,  next,  previous,  up
 @section @code{@@noindent}
 @findex noindent
 An example or other inclusion can break a paragraph into segments.
 Ordinarily, the formatters indent text that follows an example as a new
 Do not put braces after an @code{@@noindent} command; they are not
 necessary, since @code{@@noindent} is a command used outside of
 paragraphs (@pxref{Command Syntax}).@refill
+@node Lisp Example, smallexample & smalllisp, noindent, Quotations and Examples
-@node lisp
+@comment  node-name,  next,  previous,  up
 @section @code{@@lisp}
+@cindex Lisp example
 @findex lisp
-@cindex Lisp example
 The @code{@@lisp} command is used for Lisp code.  It is synonymous
 with the @code{@@example} command.
 @lisp
 Use @code{@@lisp} instead of @code{@@example} to preserve information
 regarding the nature of the example.  This is useful, for example, if
 you write a function that evaluates only and all the Lisp code in a
 Texinfo file.  Then you can use the Texinfo file as a Lisp
 library.@footnote{It would be straightforward to extend Texinfo to work
-in a similar fashion for C, Fortran, or other languages.}
+in a similar fashion for C, Fortran, or other languages.}@refill
 Mark the end of @code{@@lisp} with @code{@@end lisp} on a line by
 itself.@refill
+@node smallexample & smalllisp, display, Lisp Example, Quotations and Examples
-@node small
+@comment  node-name,  next,  previous,  up
-@section @code{@@small@dots{}} Block Commands
+@section @code{@@smallexample} and @code{@@smalllisp}
 @cindex Small book example
 @cindex Example for a small book
 @cindex Lisp example for a small book
-@findex smalldisplay
 @findex smallexample
-@findex smallformat
 @findex smalllisp
 In addition to the regular @code{@@example} and @code{@@lisp} commands,
-Texinfo has ``small'' example-style commands.  These are
+Texinfo has two other ``example-style'' commands.  These are the
-@code{@@smalldisplay}, @code{@@smallexample}, @code{@@smallformat}, and
+@code{@@smallexample} and @code{@@smalllisp} commands.  Both these
-@code{@@smalllisp}.  All of these commands are designed for use with the
+commands are designed for use with the @code{@@smallbook} command that
-@code{@@smallbook} command (which causes @TeX{} to format a printed book for
+causes @TeX{} to produce a printed manual in a 7 by 9.25 inch format
-a 7 by 9.25 inch trim size rather than the default 8.5 by 11 inch size).
+rather than the regular 8.5 by 11 inch format.@refill
-In @TeX{}, the @code{@@small@dots{}} commands typeset text in a smaller
+In @TeX{}, the @code{@@smallexample} and @code{@@smalllisp} commands
-font for the smaller @code{@@smallbook} format than for the 8.5 by 11
+typeset text in a smaller font for the smaller @code{@@smallbook}
-inch format.  Consequently, many examples containing long lines fit in a
+format than for the 8.5 by 11 inch format.  Consequently, many examples
-narrower, @code{@@smallbook} page without needing to be shortened.  Both
+containing long lines fit in a narrower, @code{@@smallbook} page
-commands typeset in the normal font size when you format for the 8.5 by
+without needing to be shortened.  Both commands typeset in the normal
-11 inch size.  Indeed, in this situation, the @code{@@small@dots{}}
+font size when you format for the 8.5 by 11 inch size; indeed,
-commands are equivalent to their non-small versions.
+in this situation, the @code{@@smallexample} and @code{@@smalllisp}
+commands are defined to be the @code{@@example} and @code{@@lisp}
-In Info, the @code{@@small@dots{}} commands are also equivalent to their
+commands.@refill
-non-small companion commands.
+In Info, the @code{@@smallexample} and @code{@@smalllisp} commands are
-Mark the end of an @code{@@small@dots{}} block with a corresponding
+equivalent to the @code{@@example} and @code{@@lisp} commands, and work
-@code{@@end small@dots{}}.  For example, pair @code{@@smallexample} with
+exactly the same.@refill
-@code{@@end smallexample}.
+Mark the end of @code{@@smallexample} or @code{@@smalllisp} with
+@code{@@end smallexample} or @code{@@end smalllisp},
+respectively.@refill
 @iftex
 Here is an example written in the small font used by the
 @code{@@smallexample} and @code{@@smalllisp} commands:
 @ifclear smallbook
 @display
 @tex
 % Remove extra vskip; this is a kludge to counter the effect of display
 \vskip-3\baselineskip
-{\smalltt
-\dots{} to make sure that you have the freedom to
-distribute copies of free software (and charge for
-this service if you wish), that you receive source
-code or can get it if you want it, that you can
-change the software or use pieces of it in new free
-programs; and that you know you can do these things.}
 @end tex
 @end display
 @end ifclear
 @end iftex
 @ifset smallbook
 this text appears in its normal size; but in a 7 by 9.25 inch manual,
 this text appears in a smaller font.
 @end smallexample
 @end ifinfo
-The @code{@@small@dots{}} commands make it easier to prepare smaller
+The @code{@@smallexample} and @code{@@smalllisp} commands make it
-format manuals without forcing you to edit examples by hand to fit them
+easier to prepare smaller format manuals without forcing you to edit
-onto narrower pages.@refill
+examples by hand to fit them onto narrower pages.@refill
-As a general rule, a printed document looks better if you use only one
+As a general rule, a printed document looks better if you write all the
-of (for example) @code{@@example} or in @code{@@smallexample}
+examples in a chapter consistently in @code{@@example} or in
-consistently within a chapter.  Only occasionally should you mix the two
+@code{@@smallexample}.  Only occasionally should you mix the two
-formats.
+formats.@refill
 @xref{smallbook, , Printing ``Small'' Books}, for more information
 about the @code{@@smallbook} command.@refill
+@node display, format, smallexample & smalllisp, Quotations and Examples
-@node display
+@comment  node-name,  next,  previous,  up
-@section @code{@@display} and @code{@@smalldisplay}
+@section @code{@@display}
 @cindex Display formatting
 @findex display
 The @code{@@display} command begins a kind of example.  It is like the
 @code{@@example} command
 This is an example of text written between an @code{@@display} command
 and an @code{@@end display} command.  The @code{@@display} command
 indents the text, but does not fill it.
 @end display
-@findex smalldisplay
+@node format, exdent, display, Quotations and Examples
-Texinfo also provides a command @code{@@smalldisplay}, which is like
+@comment  node-name,  next,  previous,  up
-@code{@@display} but uses a smaller font in @code{@@smallbook} format.
+@section @code{@@format}
-@xref{small}.
-@node format
-@section @code{@@format} and @code{@@smallformat}
 @findex format
 The @code{@@format} command is similar to @code{@@example} except
 that, in the printed manual, @code{@@format} does not select the
 fixed-width font and does not narrow the margins.@refill
 and an @code{@@end format} command.  As you can see
 from this example,
 the @code{@@format} command does not fill the text.
 @end format
-@findex smallformat
+@node exdent, flushleft & flushright, format, Quotations and Examples
-Texinfo also provides a command @code{@@smallformat}, which is like
-@code{@@format} but uses a smaller font in @code{@@smallbook} format.
-@xref{small}.
-@node exdent
 @section @code{@@exdent}: Undoing a Line's Indentation
 @cindex Indentation undoing
 @findex exdent
 The @code{@@exdent} command removes any indentation a line might have.
 rounded corners around its contents.  You can use this command to
 further highlight an example or quotation.  For instance, you could
 write a manual in which one type of example is surrounded by a cartouche
 for emphasis.@refill
-@code{@@cartouche} affects only the printed manual; it has no effect in
+The @code{@@cartouche} command affects only the printed manual; it has
-other output files.
+no effect in the Info file.@refill
 @need 1500
 For example,
 @example
 * enumerate::                   How to construct a numbered list.
 * Two-column Tables::           How to construct a two-column table.
 * Multi-column Tables::         How to construct generalized tables.
 @end menu
+@ifinfo
 @node Introducing Lists, itemize, Lists and Tables, Lists and Tables
-@ifinfo
 @heading Introducing Lists
 @end ifinfo
 Texinfo automatically indents the text in lists or tables, and numbers
 an enumerated list.  This last feature is useful if you modify the
 Enumerated lists, using numbers or letters.
 @item @@table
 @itemx @@ftable
 @itemx @@vtable
-Two-column tables, optionally with indexing.
+Two-column tables with indexing.
 @end table
+@node itemize, enumerate, Introducing Lists, Lists and Tables
-@node itemize
+@comment  node-name,  next,  previous,  up
-@section @code{@@itemize}: Making an Itemized List
+@section Making an Itemized List
 @cindex Itemization
 @findex itemize
 The @code{@@itemize} command produces sequences of indented
 paragraphs, with a bullet or other mark inside the left margin
 at the beginning of each paragraph for which such a mark is desired.@refill
-@cindex @code{@@w}, for blank items
 Begin an itemized list by writing @code{@@itemize} at the beginning of
 a line.  Follow the command, on the same line, with a character or a
 Texinfo command that generates a mark.  Usually, you will write
 @code{@@bullet} after @code{@@itemize}, but you can use
-@code{@@minus}, or any command or character that results in a single
+@code{@@minus}, or any character or any special symbol that results in
-character in the Info file.  If you don't want any mark at all, use
+a single character in the Info file.  (When you write @code{@@bullet}
-@code{@@w}.  (When you write the mark command such as
+or @code{@@minus} after an @code{@@itemize} command, you may omit the
-@code{@@bullet} after an @code{@@itemize} command, you may omit the
+@samp{@{@}}.)@refill
-@samp{@{@}}.)  If you don't specify a mark command, the default is
-@code{@@bullet}.
 Write the text of the indented paragraphs themselves after the
 @code{@@itemize}, up to another line that says @code{@@end
 itemize}.@refill
+Before each paragraph for which a mark in the margin is desired, write
+a line that says just @code{@@item}.  Do not write any other text on this
+line.@refill
 @findex item
-Before each paragraph for which a mark in the margin is desired, write a
-line that says just @code{@@item}.  It is ok to have text following the
-@code{@@item}.
 Usually, you should put a blank line before an @code{@@item}.  This
 puts a blank line in the Info file. (@TeX{} inserts the proper
 interline whitespace in either case.)  Except when the entries are
 very brief, these blank lines make the list look better.@refill
 Here is an example of the use of @code{@@itemize}, followed by the
-output it produces.  @code{@@bullet} produces an @samp{*} in Info and a
+output it produces.  Note that @code{@@bullet} produces an @samp{*} in
-round dot in @TeX{}.
+Info and a round dot in @TeX{}.@refill
 @example
 @group
 @@itemize @@bullet
 @@item
 @item
 Second outer item.
 @end itemize
 @end quotation
+@node enumerate, Two-column Tables, itemize, Lists and Tables
-@node enumerate
+@comment  node-name,  next,  previous,  up
-@section @code{@@enumerate}: Making a Numbered or Lettered List
+@section Making a Numbered or Lettered List
 @cindex Enumeration
 @findex enumerate
 @code{@@enumerate} is like @code{@@itemize} (@pxref{itemize,,
 @code{@@itemize}}), except that the labels on the items are
 command does not require an argument, but accepts either a number or a
 letter as an option.  Without an argument, @code{@@enumerate} starts the
 list with the number @samp{1}.  With a numeric argument, such as
 @samp{3}, the command starts the list with that number.  With an upper
 or lower case letter, such as @samp{a} or @samp{A}, the command starts
-the list with that letter.
+the list with that letter.@refill
 Write the text of the enumerated list in the same way you write an
 itemized list: put @code{@@item} on a line of its own before the start
 of each paragraph that you want enumerated.  Do not write any other text
-on the line beginning with @code{@@item}.
+on the line beginning with @code{@@item}.@refill
 You should put a blank line between entries in the list.
-This generally makes it easier to read the Info file.
+This generally makes it easier to read the Info file.@refill
 @need 1500
-Here is an example of @code{@@enumerate} without an argument:
+Here is an example of @code{@@enumerate} without an argument:@refill
 @example
 @group
 @@enumerate
 @@item
 * table::                       How to construct a two-column table.
 * ftable vtable::               Automatic indexing for two-column tables.
 * itemx::                       How to put more entries in the first column.
 @end menu
+@ifinfo
 @node table, ftable vtable, Two-column Tables, Two-column Tables
-@ifinfo
 @subheading Using the @code{@@table} Command
 Use the @code{@@table} command to produce two-column tables.@refill
 @end ifinfo
 (The @code{@@table} command may work with other commands besides those
 listed here.  However, you can only use commands that normally take
 arguments in braces.)@refill
-@findex item
 Begin each table entry with an @code{@@item} command at the beginning
 of a line.  Write the first column text on the same line as the
 @code{@@item} command.  Write the second column text on the line
 following the @code{@@item} line and on subsequent lines.  (You do not
 need to type anything for an empty second column entry.)  You may
 write as many lines of supporting text as you wish, even several
 paragraphs.  But only text on the same line as the @code{@@item} will
-be placed in the first column, including any footnote.
+be placed in the first column.@refill
+@findex item
 Normally, you should put a blank line before an @code{@@item} line.
 This puts a blank like in the Info file.  Except when the entries are
 very brief, a blank line looks better.@refill
 If you want to list two or more named items with a single block of
 text, use the @code{@@itemx} command.  (@xref{itemx, ,
 @code{@@itemx}}.)@refill
+@node ftable vtable, itemx, table, Two-column Tables
-@node ftable vtable
+@comment  node-name,  next,  previous,  up
 @subsection @code{@@ftable} and @code{@@vtable}
 @cindex Tables with indexes
 @cindex Indexing table entries automatically
 @findex ftable
 @findex vtable
 each of the items in the first column of the table into the index of
 functions and @code{@@vtable} automatically enters each of the items in
 the first column of the table into the index of variables.  This
 simplifies the task of creating indices.  Only the items on the same
 line as the @code{@@item} commands are indexed, and they are indexed in
-exactly the form that they appear on that line.  @xref{Indices},
+exactly the form that they appear on that line.  @xref{Indices, ,
-for more information about indices.@refill
+Creating Indices}, for more information about indices.@refill
 Begin a two-column table using @code{@@ftable} or @code{@@vtable} by
 writing the @@-command at the beginning of a line, followed on the same
 line by an argument that is a Texinfo command such as @code{@@code},
 exactly as you would for an @code{@@table} command; and end the table
 with an @code{@@end ftable} or @code{@@end vtable} command on a line by
 itself.
 See the example for @code{@@table} in the previous section.
-@node itemx
+@node itemx,  , ftable vtable, Two-column Tables
+@comment  node-name,  next,  previous,  up
 @subsection @code{@@itemx}
 @cindex Two named items for @code{@@table}
 @findex itemx
 Use the @code{@@itemx} command inside a table when you have two or more
 line of its own.  Use @code{@@itemx} for all but the first entry;
 @code{@@itemx} should always follow an @code{@@item} command.  The
 @code{@@itemx} command works exactly like @code{@@item} except that it
 does not generate extra vertical space above the first column text.
+@need 1000
 For example,
 @example
 @group
 @@table @@code
 @menu
 * Multitable Column Widths::    Defining multitable column widths.
 * Multitable Rows::             Defining multitable rows, with examples.
 @end menu
-@node Multitable Column Widths
+@node Multitable Column Widths, Multitable Rows, Multi-column Tables, Multi-column Tables
 @subsection Multitable Column Widths
 @cindex Multitable column widths
 @cindex Column widths, defining for multitables
 @cindex Widths, defining multitable column
 @example
 @@multitable @@columnfractions .33 .33 .33
 @end example
-@noindent The fractions need not add up exactly to 1.0, as these do
+@noindent
+The fractions need not add up exactly to 1.0, as these do
 not.  This allows you to produce tables that do not need the full line
-length.  You can use a leading zero if you wish.
+length.
 @item
 @cindex Prototype row, column widths defined by
 To specify a prototype row, write the longest entry for each column
 enclosed in braces after the @code{@@multitable} command.  For example:
 @subsection Multitable Rows
 @cindex Multitable rows
 @cindex Rows, of a multitable
 @findex item
-@findex tab
+@cindex tab
 After the @code{@@multitable} command defining the column widths (see
 the previous section), you begin each row in the body of a multitable
 with @code{@@item}, and separate the column entries with @code{@@tab}.
 Line breaks are not special within the table body, and you may break
 input lines in your source file as necessary.
 Here is a complete example of a multi-column table (the text is from
 @cite{The GNU Emacs Manual}, @pxref{Split Window,, Splitting Windows,
-emacs, The GNU Emacs Manual}):
+xemacs, XEmacs User's Manual}):
 @example
 @@multitable @@columnfractions .15 .45 .4
 @@item Key @@tab Command @@tab Description
 @@item C-x 2
 @@tab In the mode line or scroll bar of a window,
 split that window.
 @@end multitable
 @end example
-@noindent produces:
+@noindent
+produces:
 @multitable @columnfractions .15 .45 .4
 @item Key @tab Command @tab Description
 @item C-x 2
 @tab @code{split-window-vertically}
 @end multitable
 @node Indices, Insertions, Lists and Tables, Top
 @comment node-name,  next,  previous,  up
-@chapter Indices
+@chapter Creating Indices
 @cindex Indices
+@cindex Creating indices
 Using Texinfo, you can generate indices without having to sort and
 collate entries manually.  In an index, the entries are listed in
 alphabetical order, together with information on how to find the
 discussion of each entry.  In a printed manual, this information
 case-sensitive name such as a C or Lisp function name or a shell
 command; that would be a spelling error.
 Whichever case convention you use, please use it consistently!
+@ignore
+Concept index entries consist of English text.  The usual convention
+is to capitalize the first word of each such index entry, unless that
+word is the name of a function, variable, or other such entity that
+should not be capitalized.  However, if your concept index entries are
+consistently short (one or two words each) it may look better for each
+regular entry to start with a lower case letter, aside from proper
+names and acronyms that always call for upper case letters.  Whichever
+convention you adapt, please be consistent!
+@end ignore
 Entries in indices other than the concept index are symbol names in
 programming languages, or program names; these names are usually
 case-sensitive, so use upper and lower case as required for them.
 By default, entries for a concept index are printed in a small roman
 Make an entry in the data type index for @var{data type}.@refill
 @end table
 @quotation
 @strong{Caution:} Do not use a colon in an index entry.  In Info, a
-colon separates the menu entry name from the node name, so a colon in
+colon separates the menu entry name from the node name.  An extra
-the entry itself confuses Info.  @xref{Menu Parts, , The Parts of a
+colon confuses Info.
-Menu}, for more information about the structure of a menu entry.
+@xref{Menu Parts, , The Parts of a Menu},
+for more information about the structure of a menu entry.@refill
 @end quotation
+If you write several identical index entries in different places in a
+Texinfo file, the index in the printed manual will list all the pages to
+which those entries refer.  However, the index in the Info file will
+list @strong{only} the node that references the @strong{first} of those
+index entries.  Therefore, it is best to write indices in which each
+entry refers to only one place in the Texinfo file.  Fortunately, this
+constraint is a feature rather than a loss since it means that the index
+will be easy to use.  Otherwise, you could create an index that lists
+several pages for one entry and your reader would not know to which page
+to turn.  If you have two identical entries for one topic, change the
+topics slightly, or qualify them to indicate the difference.@refill
 You are not actually required to use the predefined indices for their
 canonical purposes.  For example, suppose you wish to index some C
 preprocessor macros.  You could put them in the function index along
 with actual functions, just by writing @code{@@findex} commands for
 You should define new indices within or right after the end-of-header
 line of a Texinfo file, before any @code{@@synindex} or
 @code{@@syncodeindex} commands (@pxref{Header}).@refill
-@node Insertions
+@node Insertions, Breaks, Indices, Top
+@comment  node-name,  next,  previous,  up
 @chapter Special Insertions
 @cindex Inserting special characters and symbols
 @cindex Special insertions
 Texinfo provides several commands for inserting characters that have
 @iftex
 These are:
 @itemize @bullet
-@item Braces and @samp{@@}.
+@item Braces, @samp{@@} and periods.
 @item Whitespace within and around a sentence.
 @item Accents.
 @item Dots and bullets.
 @item The @TeX{} logo and the copyright symbol.
-@item The pounds currency symbol.
-@item The minus sign.
 @item Mathematical expressions.
-@item Glyphs for evaluation, macros, errors, etc.
-@item Footnotes.
-@item Images.
 @end itemize
 @end iftex
 @menu
 * Braces Atsigns::              How to insert braces, @samp{@@}.
 * pounds::                      How to insert the pounds currency symbol.
 * minus::                       How to insert a minus sign.
 * math::                        How to format a mathematical expression.
 * Glyphs::                      How to indicate results of evaluation,
 expansion of macros, errors, etc.
-* Footnotes::                   How to include footnotes.
 * Images::                      How to include graphics.
 @end menu
 @node Braces Atsigns, Inserting Space, Insertions, Insertions
 @code{@@@@} stands for a single @samp{@@} in either printed or Info
 output.
 Do not put braces after an @code{@@@@} command.
+@node Inserting Braces,  , Inserting An Atsign, Braces Atsigns
-@node Inserting Braces
 @subsection Inserting @samp{@{} and @samp{@}}with @@@{ and @@@}
 @findex @{ @r{(single @samp{@{})}
 @findex @} @r{(single @samp{@}})}
 @code{@@@{} stands for a single @samp{@{} in either printed or Info
 Do not put braces after either an @code{@@@{} or an @code{@@@}}
 command.
-@node Inserting Space
+@node Inserting Space, Inserting Accents, Braces Atsigns, Insertions
 @section Inserting Space
 @cindex Inserting space
 @cindex Spacing, inserting
+@cindex Whitespace, inserting
 The following sections describe commands that control spacing of various
 kinds within and after sentences.
 @menu
 * Not Ending a Sentence::       Sometimes a . doesn't end a sentence.
 * Ending a Sentence::           Sometimes it does.
 * Multiple Spaces::             Inserting multiple spaces.
 * dmn::                         How to format a dimension.
 @end menu
+@node Not Ending a Sentence, Ending a Sentence, Inserting Space, Inserting Space
-@node Not Ending a Sentence
 @subsection Not Ending a Sentence
 @cindex Not ending a sentence
 @cindex Sentence non-ending punctuation
 @cindex Periods, inserting
 Depending on whether a period or exclamation point or question mark is
 inside or at the end of a sentence, less or more space is inserted after
-a period in a typeset manual.  Since it is not always possible
+a period in a typeset manual.  Since it is not always possible for
-to determine when a period ends a sentence and when it is used
+Texinfo to determine when a period ends a sentence and when it is used
 in an abbreviation, special commands are needed in some circumstances.
-Usually, Texinfo can guess how to handle periods, so you do not need to
+(Usually, Texinfo can guess how to handle periods, so you do not need to
 use the special commands; you just enter a period as you would if you
 were using a typewriter, which means you put two spaces after the
-period, question mark, or exclamation mark that ends a sentence.
+period, question mark, or exclamation mark that ends a sentence.)
 @findex : @r{(suppress widening)}
 Use the @code{@@:}@: command after a period, question mark,
 exclamation mark, or colon that should not be followed by extra space.
 For example, use @code{@@:}@: after periods that end abbreviations
 which are not at the ends of sentences.
+@need 700
 For example,
 @example
 The s.o.p.@@: has three parts @dots{}
 The s.o.p. has three parts @dots{}
 In the Info file output, @code{@@.}@: is equivalent to a simple
 @samp{.}; likewise for @code{@@!}@: and @code{@@?}@:.
 The meanings of @code{@@:} and @code{@@.}@: in Texinfo are designed to
 work well with the Emacs sentence motion commands (@pxref{Sentences,,,
-emacs, The GNU Emacs Manual}).
+xemacs, XEmacs User's Manual}).  This made it necessary for them to be
+incompatible with some other formatting systems that use @@-commands.
 Do not put braces after any of these commands.
 @node Multiple Spaces, dmn, Ending a Sentence, Inserting Space
 @subsection Multiple Spaces
 @cindex Multiple spaces
 @cindex Whitespace, inserting
-@cindex Space, inserting horizontal
 @findex (space)
 @findex (tab)
 @findex (newline)
 Ordinarily, @TeX{} collapses multiple whitespace characters (space, tab,
 @example
 Spacey@@ @@ @@ @@
 example.
 @end example
-@noindent produces
+@noindent
+produces
 @example
 Spacey@ @ @ @
 example.
 @end example
 @code{@@multitable} (@pxref{Multi-column Tables}).
 Do not follow any of these commands with braces.
-@node dmn
+@node dmn,  , Multiple Spaces, Inserting Space
 @subsection @code{@@dmn}@{@var{dimension}@}: Format a Dimension
 @cindex Thin space between number, dimension
 @cindex Dimension formatting
 @cindex Format a dimension
 @findex dmn
 At times, you may want to write @samp{12@dmn{pt}} or
 @samp{8.5@dmn{in}} with little or no space between the number and the
 abbreviation for the dimension.  You can use the @code{@@dmn} command
 to do this.  On seeing the command, @TeX{} inserts just enough space
 for proper typesetting; the Info formatting commands insert no space
-at all, since the Info file does not require it.
+at all, since the Info file does not require it.@refill
 To use the @code{@@dmn} command, write the number and then follow it
 immediately, with no intervening space, by @code{@@dmn}, and then by
 the dimension within braces.  For example,
 or @w{@samp{8.27 inches}} to @samp{8.27@@dmn@{in@}} in the Texinfo file.
 In these cases, however, the formatters may insert a line break between
 the number and the dimension, so use @code{@@w} (@pxref{w}).  Also, if
 you write a period after an abbreviation within a sentence, you should
 write @samp{@@:} after the period to prevent @TeX{} from inserting extra
-whitespace, as shown here.  @xref{Not Ending a Sentence}.
+whitespace, as shown here.  @xref{Inserting Space}.
-@node Inserting Accents
+@node Inserting Accents, Dots Bullets, Inserting Space, Insertions
 @section Inserting Accents
 @cindex Inserting accents
 @cindex Accents, inserting
 @cindex Floating accents, inserting
 @findex ,
 @cindex Cedilla accent
 @findex dotaccent
 @cindex Dot accent
 @findex H
-@cindex Hungarian umlaut accent
+@cindex Hungariam umlaut accent
 @findex ringaccent
 @cindex Ring accent
 @findex tieaccent
 @cindex Tie-after accent
 @findex u
 @findex ss
 @cindex @ss{}
 @cindex Es-zet
 @cindex Sharp S
 @cindex German S
-@multitable {x@@questiondown@{@} } {oe,OE} {es-zet or sharp S}
+@multitable {@@questiondown@{@}} {oe,OE} {es-zet or sharp S}
 @item @t{@@exclamdown@{@}}   @tab @exclamdown{}   @tab upside-down !
 @item @t{@@questiondown@{@}} @tab @questiondown{} @tab upside-down ?
-@item @t{@@aa@{@},@@AA@{@}}  @tab @aa{},@AA{}     @tab a,A with circle
+@item @t{@@aa@{@},@@AA@{@}}  @tab @aa{},@AA{}     @tab A,a with circle
 @item @t{@@ae@{@},@@AE@{@}}  @tab @ae{},@AE{}     @tab ae,AE ligatures
 @item @t{@@dotless@{i@}}     @tab @dotless{i}     @tab dotless i
 @item @t{@@dotless@{j@}}     @tab @dotless{j}     @tab dotless j
 @item @t{@@l@{@},@@L@{@}}    @tab @l{},@L{}       @tab suppressed-L,l
 @item @t{@@o@{@},@@O@{@}}    @tab @o{},@O{}       @tab O,o with slash
-@item @t{@@oe@{@},@@OE@{@}}  @tab @oe{},@OE{}     @tab oe,OE ligatures
+@item @t{@@oe@{@},@@OE@{@}}  @tab @oe{},@OE{}     @tab OE,oe ligatures
 @item @t{@@ss@{@}}           @tab @ss{}           @tab es-zet or sharp S
 @end multitable
-@node Dots Bullets
+@node Dots Bullets, TeX and copyright, Inserting Accents, Insertions
-@section Inserting Ellipsis and Bullets
+@section Inserting Ellipsis, Dots, and Bullets
 @cindex Dots, inserting
 @cindex Bullets, inserting
 @cindex Ellipsis, inserting
 @cindex Inserting ellipsis
 @cindex Inserting dots
 * dots::                        How to insert dots @dots{}
 * bullet::                      How to insert a bullet.
 @end menu
-@node dots
+@node dots, bullet, Dots Bullets, Dots Bullets
-@subsection @code{@@dots}@{@} (@dots{}) and @code{@@enddots}@{@} (@enddots{})
+@subsection @code{@@dots}@{@} (@dots{})
 @findex dots
-@findex enddots
 @cindex Inserting dots
 @cindex Dots, inserting
 Use the @code{@@dots@{@}} command to generate an ellipsis, which is
 three dots in a row, appropriately spaced, like this: `@dots{}'.  Do
 In printed output, the three periods in a row are closer together than
 the dots in the ellipsis.
 @end iftex
-@node bullet
+@node bullet,  , dots, Dots Bullets
 @subsection @code{@@bullet}@{@} (@bullet{})
 @findex bullet
 Use the @code{@@bullet@{@}} command to generate a large round dot, or
 the closest possible thing to one.  In Info, an asterisk is used.@refill
 * tex::                         How to insert the @TeX{} logo.
 * copyright symbol::            How to use @code{@@copyright}@{@}.
 @end menu
-@node tex
+@node tex, copyright symbol, TeX and copyright, TeX and copyright
 @subsection @code{@@TeX}@{@} (@TeX{})
 @findex tex (command)
 Use the @code{@@TeX@{@}} command to generate `@TeX{}'.  In a printed
 manual, this is a special logo that is different from three ordinary
 letters.  In Info, it just looks like @samp{TeX}.  The
 @code{@@TeX@{@}} command is unique among Texinfo commands in that the
-@samp{T} and the @samp{X} are in upper case.@refill
+@kbd{T} and the @kbd{X} are in upper case.@refill
-@node copyright symbol
+@node copyright symbol,  , tex, TeX and copyright
 @subsection @code{@@copyright}@{@} (@copyright{})
 @findex copyright
 Use the @code{@@copyright@{@}} command to generate `@copyright{}'.  In
 a printed manual, this is a @samp{c} inside a circle, and in Info,
 this is @samp{(C)}.@refill
 @node pounds, minus, TeX and copyright, Insertions
-@section @code{@@pounds}@{@} (@pounds{}): Pounds Sterling
+@section @code{@@pounds@{@}} (@pounds{}): Pounds Sterling
 @findex pounds
 Use the @code{@@pounds@{@}} command to generate `@pounds{}'.  In a
 printed manual, this is the symbol for the currency pounds sterling.
 In Info, it is a @samp{#}.  Other currency symbols are unfortunately not
 an itemized list, you do not need to type the braces
 (@pxref{itemize, , @code{@@itemize}}.)
 @node math, Glyphs, minus, Insertions
-@section @code{@@math}: Inserting Mathematical Expressions
+@section @code{@@math} - Inserting Mathematical Expressions
 @findex math
 @cindex Mathematical expressions
 You can write a short mathematical expression with the @code{@@math}
 command.  Write the mathematical expression between braces, like this:
 (@pxref{Raw Formatter Commands}).  When you use @TeX{} directly,
 remember to write the mathematical expression between one or two
 @samp{$} (dollar-signs) as appropriate.
-@node Glyphs
+@node Glyphs, Images, math, Insertions
 @section Glyphs for Examples
 @cindex Glyphs
 In Texinfo, code is often illustrated in examples that are delimited
 by @code{@@example} and @code{@@end example}, or by @code{@@lisp} and
 @code{@@point@{@}} shows the location of point.@refill
 @end table
 @menu
 * result::
 * expansion::
 * Print Glyph::
 * Error Glyph::
 * Equivalence::
 * Point Glyph::
 @end menu
 @node result, expansion, Glyphs Summary, Glyphs
 @subsection @code{@@result@{@}} (@result{}): Indicating Evaluation
 @cindex Result of an expression
 @cindex Indicating evaluation
 @cindex Evaluation glyph
 @cindex Value of an expression, indicating
-@findex result
 Use the @code{@@result@{@}} command to indicate the result of
 evaluating an expression.@refill
 @iftex
 @node expansion, Print Glyph, result, Glyphs
 @subsection @code{@@expansion@{@}} (@expansion{}): Indicating an Expansion
 @cindex Expansion, indicating it
-@findex expansion
 When an expression is a macro call, it expands into a new expression.
 You can indicate the result of the expansion with the
 @code{@@expansion@{@}} command.@refill
 @node Print Glyph, Error Glyph, expansion, Glyphs
 @subsection @code{@@print@{@}} (@print{}): Indicating Printed Output
 @cindex Printed output, indicating it
-@findex print
 Sometimes an expression will print output during its execution.  You
 can indicate the printed output with the @code{@@print@{@}} command.@refill
 @iftex
 @node Error Glyph, Equivalence, Print Glyph, Glyphs
 @subsection @code{@@error@{@}} (@error{}): Indicating an Error Message
 @cindex Error message, indicating it
-@findex error
 A piece of code may cause an error when you evaluate it.  You can
 designate the error message with the @code{@@error@{@}} command.@refill
 @iftex
 @node Equivalence, Point Glyph, Error Glyph, Glyphs
 @subsection @code{@@equiv@{@}} (@equiv{}): Indicating Equivalence
 @cindex Equivalence, indicating it
-@findex equiv
 Sometimes two expressions produce identical results.  You can indicate the
 exact equivalence of two forms with the @code{@@equiv@{@}} command.@refill
 @iftex
 @noindent
 This indicates that evaluating @code{(make-sparse-keymap)} produces
 identical results to evaluating @code{(list 'keymap)}.
-@node Point Glyph
+@node Point Glyph,  , Equivalence, Glyphs
 @subsection @code{@@point@{@}} (@point{}): Indicating Point in a Buffer
-@cindex Point, indicating in a buffer
+@cindex Point, indicating it in a buffer
-@findex point
 Sometimes you need to show an example of text in an Emacs buffer.  In
 such examples, the convention is to include the entire contents of the
 buffer in question between two lines of dashes containing the buffer
 name.@refill
 ---------- Buffer: foo ----------
 @@end example
 @end example
-@node Footnotes
-@section Footnotes
-@cindex Footnotes
-@findex footnote
-A @dfn{footnote} is for a reference that documents or elucidates the
-primary text.@footnote{A footnote should complement or expand upon
-the primary text, but a reader should not need to read a footnote to
-understand the primary text.  For a thorough discussion of footnotes,
-see @cite{The Chicago Manual of Style}, which is published by the
-University of Chicago Press.}@refill
-@menu
-* Footnote Commands::           How to write a footnote in Texinfo.
-* Footnote Styles::             Controlling how footnotes appear in Info.
-@end menu
-@node Footnote Commands
-@subsection Footnote Commands
-In Texinfo, footnotes are created with the @code{@@footnote} command.
-This command is followed immediately by a left brace, then by the text
-of the footnote, and then by a terminating right brace.  Footnotes may
-be of any length (they will be broken across pages if necessary), but
-are usually short.  The template is:
-@example
-ordinary text@@footnote@{@var{text of footnote}@}
-@end example
-As shown here, the @code{@@footnote} command should come right after the
-text being footnoted, with no intervening space; otherwise, the footnote
-marker might end up starting a line.
-For example, this clause is followed by a sample footnote@footnote{Here
-is the sample footnote.}; in the Texinfo source, it looks like
-this:@refill
-@example
-@dots{}a sample footnote@@footnote@{Here is the sample
-footnote.@}; in the Texinfo source@dots{}
-@end example
-In a printed manual or book, the reference mark for a footnote is a
-small, superscripted number; the text of the footnote appears at the
-bottom of the page, below a horizontal line.@refill
-In Info, the reference mark for a footnote is a pair of parentheses
-with the footnote number between them, like this: @samp{(1)}.  The
-reference mark is followed by a cross-reference link to the footnote's
-text.
-In the HTML output, footnote references are marked with a small,
-superscripted number which is rendered as a hypertext link to the
-footnote text.
-By the way, footnotes in the argument of an @code{@@item} command for a
-@code{@@table} must be on the same line as the @code{@@item}
-(as usual).  @xref{Two-column Tables}.
-@node Footnote Styles
-@subsection Footnote Styles
-Info has two footnote styles, which determine where the text of the
-footnote is located:@refill
-@itemize @bullet
-@cindex @samp{@r{End}} node footnote style
-@item
-In the `End' node style, all the footnotes for a single node
-are placed at the end of that node.  The footnotes are separated from
-the rest of the node by a line of dashes with the word
-@samp{Footnotes} within it.  Each footnote begins with an
-@samp{(@var{n})} reference mark.@refill
-@need 700
-@noindent
-Here is an example of a single footnote in the end of node style:@refill
-@example
-@group
---------- Footnotes ---------
-(1)  Here is a sample footnote.
-@end group
-@end example
-@cindex @samp{@r{Separate}} footnote style
-@item
-In the `Separate' node style, all the footnotes for a single
-node are placed in an automatically constructed node of
-their own.  In this style, a ``footnote reference'' follows
-each @samp{(@var{n})} reference mark in the body of the
-node.  The footnote reference is actually a cross reference
-which you use to reach the footnote node.@refill
-The name of the node with the footnotes is constructed
-by appending @w{@samp{-Footnotes}} to the name of the node
-that contains the footnotes. (Consequently, the footnotes'
-node for the @file{Footnotes} node is
-@w{@file{Footnotes-Footnotes}}!)  The footnotes' node has an
-`Up' node pointer that leads back to its parent node.@refill
-@noindent
-Here is how the first footnote in this manual looks after being
-formatted for Info in the separate node style:@refill
-@smallexample
-@group
-File: texinfo.info  Node: Overview-Footnotes, Up: Overview
-(1) The first syllable of "Texinfo" is pronounced like "speck", not
-"hex". @dots{}
-@end group
-@end smallexample
-@end itemize
-A Texinfo file may be formatted into an Info file with either footnote
-style.@refill
-@findex footnotestyle
-Use the @code{@@footnotestyle} command to specify an Info file's
-footnote style.  Write this command at the beginning of a line followed
-by an argument, either @samp{end} for the end node style or
-@samp{separate} for the separate node style.
-@need 700
-For example,
-@example
-@@footnotestyle end
-@end example
-@noindent
-or
-@example
-@@footnotestyle separate
-@end example
-Write an @code{@@footnotestyle} command before or shortly after the
-end-of-header line at the beginning of a Texinfo file.  (If you
-include the @code{@@footnotestyle} command between the start-of-header
-and end-of-header lines, the region formatting commands will format
-footnotes as specified.)@refill
-If you do not specify a footnote style, the formatting commands use
-their default style.  Currently, @code{texinfo-format-buffer} and
-@code{texinfo-format-region} use the `separate' style and
-@code{makeinfo} uses the `end' style.@refill
-@c !!! note: makeinfo's --footnote-style option overrides footnotestyle
-@ignore
-If you use @code{makeinfo} to create the Info file, the
-@samp{--footnote-style} option determines which style is used,
-@samp{end} for the end of node style or @samp{separate} for the
-separate node style.  Thus, to format the Texinfo manual in the
-separate node style, you would use the following shell command:@refill
-@example
-makeinfo --footnote-style=separate texinfo.texi
-@end example
-@noindent
-To format the Texinfo manual in the end of node style, you would
-type:@refill
-@example
-makeinfo --footnote-style=end texinfo.texi
-@end example
-@end ignore
-@ignore
-If you use @code{texinfo-format-buffer} or
-@code{texinfo-format-region} to create the Info file, the value of the
-@code{texinfo-footnote-style} variable controls the footnote style.
-It can be either @samp{"separate"} for the separate node style or
-@samp{"end"} for the end of node style.  (You can change the value of
-this variable with the @kbd{M-x edit-options} command (@pxref{Edit
-Options, , Editing Variable Values, emacs, The GNU Emacs Manual}), or
-with the @kbd{M-x set-variable} command (@pxref{Examining, , Examining
-and Setting Variables, emacs, The GNU Emacs Manual}).@refill
-The @code{texinfo-footnote-style} variable also controls the style if
-you use the @kbd{M-x makeinfo-region} or @kbd{M-x makeinfo-buffer}
-command in Emacs.@refill
-@end ignore
-@ifinfo
-This chapter contains two footnotes.@refill
-@end ifinfo
 @c this should be described with figures when we have them
 @c perhaps in the quotation/example chapter.
-@node Images
+@node Images,  , Glyphs, Insertions
 @section Inserting Images
 @cindex Images, inserting
 @cindex Pictures, inserting
 @findex image
-You can insert an image given in an external file with the
+You can insert an image in an external file with the @code{@@image}
-@code{@@image} command:
+command:
 @example
 @@image@{@var{filename}, @r{[}@var{width}@r{]}, @r{[}@var{height}@r{]}@}
 @end example
 @cindex Formats for images
 @cindex Image formats
 The @var{filename} argument is mandatory, and must not have an
 extension, because the different processors support different formats:
-@itemize @bullet
-@item
 @TeX{} reads the file @file{@var{filename}.eps} (Encapsulated PostScript
-format).
+format); @code{makeinfo} uses @file{@var{filename}.txt} verbatim for
-@item
+Info output (more or less as if it was an @code{@@example}).  HTML
-@pindex pdftex@r{, and images}
+output requires @file{@var{filename}.jpg}.
-PDF@TeX{} reads @file{@var{filename}.pdf} (Adobe's Portable Document Format).
-@item
-@code{makeinfo} uses @file{@var{filename}.txt} verbatim for
-Info output (more or less as if it was an @code{@@example}).
-@item
-@cindex GIF, unsupported due to patents
-@cindex PNG image format
-@cindex JPEG image format
-@code{makeinfo} producing HTML output tries @file{@var{filename}.png};
-if that does not exist, it tries @file{@var{filename}.jpg}.  If that
-does not exist either, it complains.  (We cannot support GIF format due
-to patents.)
-@end itemize
 @cindex Width of images
 @cindex Height of images
 @cindex Aspect ratio of images
 @cindex Distorting images
 The optional @var{width} and @var{height} arguments specify the size to
-scale the image to (they are ignored for Info output).  If neither is
+scale the image to (they are ignored for Info output).  If they are both
 specified, the image is presented in its natural size (given in the
 file); if only one is specified, the other is scaled proportionately;
 and if both are specified, both are respected, thus possibly distorting
 the original image by changing its aspect ratio.
 @@image@{ridt,,1in@}
 @end example
 @pindex epsf.tex
 For @code{@@image} to work with @TeX{}, the file @file{epsf.tex} must be
-installed somewhere that @TeX{} can find it.  (The standard location is
+installed somewhere that @TeX{} can find it.  This file is included in
-@file{@var{texmf}/tex/generic/dvips/epsf.tex}, where @var{texmf} is a
+the Texinfo distribution and is available from
-root of your @TeX{} directory tree.)  This file is included in the
+@uref{ftp://ftp.tug.org/tex/epsf.tex}.
-Texinfo distribution and is available from
-@uref{ftp://tug.org/tex/epsf.tex}.
+@node Breaks, Definition Commands, Insertions, Top
-@code{@@image} can be used within a line as well as for displayed
-figures.  Therefore, if you intend it to be displayed, be sure to leave
-a blank line before the command, or the output will run into the
-preceding text.
-@node Breaks
 @chapter Making and Preventing Breaks
 @cindex Making line and page breaks
 @cindex Preventing line and page breaks
 Usually, a Texinfo file is processed both by @TeX{} and by one of the
 * page::                        How to force the start of a new page.
 * group::                       How to prevent unwanted page breaks.
 * need::                        Another way to prevent unwanted page breaks.
 @end menu
+@ifinfo
 @node Break Commands, Line Breaks, Breaks, Breaks
-@ifinfo
+@heading The Break Commands
-@heading Break Commands
 @end ifinfo
+@iftex
+@sp 1
+@end iftex
 The break commands create or allow line and paragraph breaks:@refill
 @table @code
 @item @@*
 Tell @TeX{} how to hyphenate @var{hy-phen-a-ted words}.  As shown, you
 put a @samp{-} at each hyphenation point.  For example:
 @example
 @@hyphenation@{man-u-script man-u-scripts@}
 @end example
-@noindent @TeX{} only uses the specified hyphenation points when the
+@noindent
+@TeX{} only uses the specified hyphenation points when the
 words match exactly, so give all necessary variants.
 @end table
 Info output is not hyphenated, so these commands have no effect there.
-@node w
+@node w, sp, - and hyphenation, Breaks
+@comment  node-name,  next,  previous,  up
 @section @code{@@w}@{@var{text}@}: Prevent Line Breaks
 @findex w @r{(prevent line break)}
 @cindex Line breaks, preventing
 @cindex Hyphenation, preventing
 @code{@@w@{@var{text}@}} outputs @var{text} and prohibits line breaks
 within @var{text}.@refill
 You can use the @code{@@w} command to prevent @TeX{} from automatically
 hyphenating a long name or phrase that happens to fall near the end of a
-line.  For example:
+line.@refill
 @example
-You can copy GNU software from @@w@{@@samp@{ftp.gnu.org@}@}.
+You can copy GNU software from @@w@{@@samp@{ftp.gnu.ai.mit.edu@}@}.
 @end example
 @noindent
 produces
 @quotation
-You can copy GNU software from @w{@samp{ftp.gnu.org}}.
+You can copy GNU software from @w{@samp{ftp.gnu.ai.mit.edu}}.
 @end quotation
-@cindex Non-breakable space
+@quotation
-@cindex Unbreakable space
+@strong{Caution:} Do not write an @code{@@refill} command at the end
-@cindex Tied space
+of a paragraph containing an @code{@@w} command; it will cause the
-You can also use @code{@@w} to produce a non-breakable space:
+paragraph to be refilled and may thereby negate the effect of the
+@code{@@w} command.@refill
-@example
+@end quotation
-None of the formatters will break at this@@w@{ @}space.
-@end example
+@node sp, page, w, Breaks
+@comment  node-name,  next,  previous,  up
-@node sp
 @section @code{@@sp} @var{n}: Insert Blank Lines
 @findex sp @r{(line spacing)}
-@cindex Space, inserting vertical
+@cindex Spaces (blank lines)
 @cindex Blank lines
 @cindex Line spacing
 A line beginning with and containing only @code{@@sp @var{n}}
 generates @var{n} blank lines of space in both the printed manual and
 the Info file.  @code{@@sp} also forces a paragraph break.  For
-example,
+example,@refill
 @example
 @@sp 2
 @end example
 @end example
 The @code{@@need} command is useful for preventing orphans (single
 lines at the bottoms of printed pages).@refill
+@node Definition Commands, Footnotes, Breaks, Top
-@node Definition Commands
 @chapter Definition Commands
 @cindex Definition commands
 The @code{@@deffn} command and the other @dfn{definition commands}
 enable you to describe functions, variables, macros, commands, user
 @deffn {Interactive Command} isearch-forward
 @deffnx {Interactive Command} isearch-backward
 These two search commands are similar except @dots{}
 @end deffn
-Each definition command has an `x' form: @code{@@defunx},
+Each of the other definition commands has an `x' form: @code{@@defunx},
 @code{@@defvrx}, @code{@@deftypefunx}, etc.
 The `x' forms work just like @code{@@itemx}; see @ref{itemx, , @code{@@itemx}}.
 @node Def Cmds in Detail, Def Cmd Conventions, deffnx, Definition Commands
 @findex defspec
 @item @@defspec @var{name} @var{arguments}@dots{}
 The @code{@@defspec} command is the definition command for special
 forms.  (In Lisp, a special form is an entity much like a function,
-@pxref{Special Forms,,, elisp, GNU Emacs Lisp Reference Manual}.)
+@pxref{Special Forms,,, lispref, XEmacs Lisp Reference Manual}.)
 @code{@@defspec} is equivalent to @samp{@@deffn @{Special Form@}
 @dots{}} and works like @code{@@defun}.@refill
 @end table
 @node Variables Commands, Typed Functions, Functions Commands, Def Cmds in Detail
 The @code{@@defvr} command is a general definition command for
 something like a variable---an entity that records a value.  You must
 choose a term to describe the category of entity being defined; for
 example, ``Variable'' could be used if the entity is a variable.
 Write the @code{@@defvr} command at the beginning of a line and
-follow it on the same line by the category of the entity and the
+followed it on the same line by the category of the entity and the
-name of the entity.
+name of the entity.@refill
 Capitalize the category name like a title.  If the name of the category
 contains spaces, as in the name ``User Option'', enclose it in braces.
 Otherwise, the second word will be mistaken for the name of the entity.
 For example,
 @findex defopt
 @item @@defopt @var{name}
 @cindex User options, marking
 The @code{@@defopt} command is the definition command for @dfn{user
 options}, i.e., variables intended for users to change according to
-taste; Emacs has many such (@pxref{Variables,,, emacs, The GNU Emacs
+taste; Emacs has many such (@pxref{Variables,,, xemacs, XEmacs User's
 Manual}).  @code{@@defopt} is equivalent to @samp{@@defvr @{User
 Option@} @dots{}} and works like @code{@@defvar}.@refill
 @end table
 @code{@@deftypevar} creates an entry in the index of variables for
 @var{name}.@refill
 @end table
-@node Abstract Objects
+@node Abstract Objects, Data Types, Typed Variables, Def Cmds in Detail
 @subsection Object-Oriented Programming
 Here are the commands for formatting descriptions about abstract
 objects, such as are used in object-oriented programming.  A class is
 a defined type of abstract object.  An instance of a class is a
 @noindent
 illustrates how you would write the first line of a definition of the
 @code{border-pattern} class option of the class @code{Window}.@refill
-The template is:
+The template is
 @example
 @group
 @@defcv @var{category} @var{class} @var{name}
 @dots{}
 @@end defcv
 The @code{@@defivar} command is the definition command for instance
 variables in object-oriented programming.  @code{@@defivar} is
 equivalent to @samp{@@defcv @{Instance Variable@} @dots{}}@refill
 The template is:
 @example
 @group
 @@defivar @var{class} @var{instance-variable-name}
 @var{body-of-definition}
 @@end defivar
 @end group
 @end example
 @code{@@defivar} creates an entry in the index of variables.
-@findex deftypeivar
-@item @@deftypeivar @var{class} @var{data-type} @var{name}
-The @code{@@deftypeivar} command is the definition command for typed
-instance variables in object-oriented programming.  It is similar to
-@code{@@defivar} with the addition of the @var{data-type} parameter to
-specify the type of the instance variable.  @code{@@deftypeivar} creates an
-entry in the index of variables.
 @findex defop
 @item @@defop @var{category} @var{class} @var{name} @var{arguments}@dots{}
 The @code{@@defop} command is the general definition command for
 entities that may resemble methods in object-oriented programming.
-These entities take arguments, as functions do, but are associated with
+These entities take arguments, as functions do, but are associated
-particular classes of objects.@refill
+with particular classes of objects.@refill
 For example, some systems have constructs called @dfn{wrappers} that
 are associated with classes as methods are, but that act more like
 macros than like functions.  You could use @code{@@defop Wrapper} to
 describe one of these.@refill
 The @code{@@defop} command is written at the beginning of a line and
 is followed on the same line by the overall name of the category of
 operation, the name of the class of the operation, the name of the
 operation, and its arguments, if any.@refill
+@need 800
+@noindent
 The template is:
 @example
 @group
 @@defop @var{category} @var{class} @var{name} @var{arguments}@dots{}
 @var{body-of-definition}
 @@end defop
 @end group
 @end example
 @code{@@defop} creates an entry, such as `@code{expose} on
 @code{windows}', in the index of functions.@refill
-@findex deftypeop
-@item @@deftypeop @var{category} @var{class} @var{data-type} @var{name} @var{arguments}@dots{}
-The @code{@@deftypeop} command is the definition command for typed
-operations in object-oriented programming.  It is similar to
-@code{@@defop} with the addition of the @var{data-type} parameter to
-specify the return type of the method.  @code{@@deftypeop} creates an
-entry in the index of functions.
 @item @@defmethod @var{class} @var{name} @var{arguments}@dots{}
 @findex defmethod
 The @code{@@defmethod} command is the definition command for methods
 in object-oriented programming.  A method is a kind of function that
 implements an operation for a particular class of objects and its
-subclasses.
+subclasses.  In the Lisp Machine, methods actually were functions, but
-@ignore
-@c ADR: Who cares?!?
-@c KB: Oh, I don't know, I think this info is crucial!
-In the Lisp Machine, methods actually were functions, but
 they were usually defined with @code{defmethod}.
-@end ignore
 @code{@@defmethod} is equivalent to @samp{@@defop Method @dots{}}.
 The command is written at the beginning of a line and is followed by
 the name of the class of the method, the name of the method, and its
 arguments, if any.@refill
-@noindent
+@need 800
-For example:
+@noindent
+For example,
 @example
 @group
 @@defmethod @code{bar-class} bar-method argument
 @dots{}
 @@end defmethod
 @end group
 @end example
 @code{@@defmethod} creates an entry, such as `@code{bar-method} on
 @code{bar-class}', in the index of functions.@refill
 @item @@deftypemethod @var{class} @var{data-type} @var{name} @var{arguments}@dots{}
 @findex defmethod
 The @code{@@deftypemethod} command is the definition command for methods
 in object-oriented typed languages, such as C++ and Java.  It is similar
 @var{data-type} parameter to specify the return type of the method.
 @end table
-@node Data Types
+@node Data Types,  , Abstract Objects, Def Cmds in Detail
 @subsection Data Types
 Here is the command for data types:@refill
 @table @code
 A function definition uses the @code{@@defun} and @code{@@end defun}
 commands.  The name of the function follows immediately after the
 @code{@@defun} command and it is followed, on the same line, by the
 parameter list.@refill
-Here is a definition from @ref{Calling Functions,,, elisp, The GNU Emacs
+Here is a definition from @ref{Calling Functions,,, lispref, XEmacs Lisp
-Lisp Reference Manual}.
+Reference Manual}.
 @quotation
 @defun apply function &rest arguments
 @code{apply} calls @var{function} with @var{arguments}, just
 like @code{funcall} but with one difference: the last of
 In the Texinfo source file, this example looks like this:
 @example
 @group
 @@defun apply function &rest arguments
 @@code@{apply@} calls @@var@{function@} with
 @@var@{arguments@}, just like @@code@{funcall@} but with one
 difference: the last of @@var@{arguments@} is a list of
 arguments to give to @@var@{function@}, rather than a single
 argument.  We also say that this list is @@dfn@{appended@}
 @@end example
 @end group
 @group
 An interesting example of using @@code@{apply@} is found
-in the description of @@code@{mapcar@}.
+in the description of @@code@{mapcar@}.@@refill
 @@end defun
 @end group
 @end example
 @noindent
 Ordinary variables and user options are described using a format like
 that for functions except that variables do not take arguments.
-@node Conditionals
+@node Footnotes, Conditionals, Definition Commands, Top
+@chapter Footnotes
+@cindex Footnotes
+@findex footnote
+A @dfn{footnote} is for a reference that documents or elucidates the
+primary text.@footnote{A footnote should complement or expand upon
+the primary text, but a reader should not need to read a footnote to
+understand the primary text.  For a thorough discussion of footnotes,
+see @cite{The Chicago Manual of Style}, which is published by the
+University of Chicago Press.}@refill
+@menu
+* Footnote Commands::           How to write a footnote in Texinfo.
+* Footnote Styles::             Controlling how footnotes appear in Info.
+@end menu
+@node Footnote Commands, Footnote Styles, Footnotes, Footnotes
+@section Footnote Commands
+In Texinfo, footnotes are created with the @code{@@footnote} command.
+This command is followed immediately by a left brace, then by the text
+of the footnote, and then by a terminating right brace.  Footnotes may
+be of any length (they will be broken across pages if necessary), but
+are usually short.  The template is:
+@example
+ordinary text@@footnote@{@var{text of footnote}@}
+@end example
+As shown here, the @code{@@footnote} command should come right after the
+text being footnoted, with no intervening space; otherwise, the
+formatters the footnote mark might end up starting up a line.
+For example, this clause is followed by a sample
+footnote@footnote{Here is the sample footnote.}; in the Texinfo
+source, it looks like this:@refill
+@example
+@dots{}a sample footnote@@footnote@{Here is the sample
+footnote.@}; in the Texinfo source@dots{}
+@end example
+@strong{Warning:} Don't use footnotes in the argument of the
+@code{@@item} command for a @code{@@table} table.  This doesn't work, and
+because of limitations of @TeX{}, there is no way to fix it.  You must
+put the footnote into the body text of the table.
+In a printed manual or book, the reference mark for a footnote is a
+small, superscripted number; the text of the footnote appears at the
+bottom of the page, below a horizontal line.@refill
+In Info, the reference mark for a footnote is a pair of parentheses
+with the footnote number between them, like this: @samp{(1)}.@refill
+@node Footnote Styles,  , Footnote Commands, Footnotes
+@section Footnote Styles
+Info has two footnote styles, which determine where the text of the
+footnote is located:@refill
+@itemize @bullet
+@cindex @samp{@r{End}} node footnote style
+@item
+In the `End' node style, all the footnotes for a single node
+are placed at the end of that node.  The footnotes are separated from
+the rest of the node by a line of dashes with the word
+@samp{Footnotes} within it.  Each footnote begins with an
+@samp{(@var{n})} reference mark.@refill
+@need 700
+@noindent
+Here is an example of a single footnote in the end of node style:@refill
+@example
+@group
+--------- Footnotes ---------
+(1)  Here is a sample footnote.
+@end group
+@end example
+@cindex @samp{@r{Separate}} footnote style
+@item
+In the `Separate' node style, all the footnotes for a single
+node are placed in an automatically constructed node of
+their own.  In this style, a ``footnote reference'' follows
+each @samp{(@var{n})} reference mark in the body of the
+node.  The footnote reference is actually a cross reference
+which you use to reach the footnote node.@refill
+The name of the node containing the footnotes is constructed
+by appending @w{@samp{-Footnotes}} to the name of the node
+that contains the footnotes. (Consequently, the footnotes'
+node for the @file{Footnotes} node is
+@w{@file{Footnotes-Footnotes}}!)  The footnotes' node has an
+`Up' node pointer that leads back to its parent node.@refill
+@noindent
+Here is how the first footnote in this manual looks after being
+formatted for Info in the separate node style:@refill
+@smallexample
+@group
+File: texinfo.info  Node: Overview-Footnotes, Up: Overview
+(1) Note that the first syllable of "Texinfo" is
+pronounced like "speck", not "hex". @dots{}
+@end group
+@end smallexample
+@end itemize
+A Texinfo file may be formatted into an Info file with either footnote
+style.@refill
+@findex footnotestyle
+Use the @code{@@footnotestyle} command to specify an Info file's
+footnote style.  Write this command at the beginning of a line followed
+by an argument, either @samp{end} for the end node style or
+@samp{separate} for the separate node style.
+@need 700
+For example,
+@example
+@@footnotestyle end
+@end example
+@noindent
+or
+@example
+@@footnotestyle separate
+@end example
+Write an @code{@@footnotestyle} command before or shortly after the
+end-of-header line at the beginning of a Texinfo file.  (If you
+include the @code{@@footnotestyle} command between the start-of-header
+and end-of-header lines, the region formatting commands will format
+footnotes as specified.)@refill
+If you do not specify a footnote style, the formatting commands use
+their default style.  Currently, @code{texinfo-format-buffer} and
+@code{texinfo-format-region} use the `separate' style and
+@code{makeinfo} uses the `end' style.@refill
+@c !!! note: makeinfo's --footnote-style option overrides footnotestyle
+@ignore
+If you use @code{makeinfo} to create the Info file, the
+@samp{--footnote-style} option determines which style is used,
+@samp{end} for the end of node style or @samp{separate} for the
+separate node style.  Thus, to format the Texinfo manual in the
+separate node style, you would use the following shell command:@refill
+@example
+makeinfo --footnote-style=separate texinfo.texi
+@end example
+@noindent
+To format the Texinfo manual in the end of node style, you would
+type:@refill
+@example
+makeinfo --footnote-style=end texinfo.texi
+@end example
+@end ignore
+@ignore
+If you use @code{texinfo-format-buffer} or
+@code{texinfo-format-region} to create the Info file, the value of the
+@code{texinfo-footnote-style} variable controls the footnote style.
+It can be either @samp{"separate"} for the separate node style or
+@samp{"end"} for the end of node style.  (You can change the value of
+this variable with the @kbd{M-x edit-options} command (@pxref{Edit
+Options, , Editing Variable Values, xemacs, XEmacs User's Manual}), or
+with the @kbd{M-x set-variable} command (@pxref{Examining, , Examining
+and Setting Variables, xemacs, XEmacs User's Manual}).@refill
+The @code{texinfo-footnote-style} variable also controls the style if
+you use the @kbd{M-x makeinfo-region} or @kbd{M-x makeinfo-buffer}
+command in Emacs.@refill
+@end ignore
+This chapter contains two footnotes.@refill
+@node Conditionals, Macros, Footnotes, Top
+@comment  node-name,  next,  previous,  up
 @chapter Conditionally Visible Text
 @cindex Conditionally visible text
 @cindex Text, conditionally visible
 @cindex Visibility of conditional text
 @cindex If text conditionally visible
-Sometimes it is good to use different text for different output formats.
+Sometimes it is good to use different text for a printed manual and
-For example, you can use the @dfn{conditional commands} to specify
+its corresponding Info file.  In this case, you can use the
-different text for the printed manual and the Info output.
+@dfn{conditional commands} to specify which text is for the printed manual
+and which is for the Info file.@refill
-Conditional commands may not be nested.
-The conditional commands comprise the following categories.
-@itemize @bullet
-@item Commands for HTML, Info, or @TeX{}.
-@item Commands for not HTML, Info, or @TeX{}.
-@item Raw @TeX{} or HTML commands.
-@item
-Substituting text for all formats, and testing if a flag is set or clear.
-@end itemize
 @menu
 * Conditional Commands::        Specifying text for HTML, Info, or @TeX{}.
 * Conditional Not Commands::    Specifying text for not HTML, Info, or @TeX{}.
 * Raw Formatter Commands::      Using raw @TeX{} or HTML commands.
 * set clear value::             Designating which text to format (for
 all output formats); and how to set a
 flag to a string that you can insert.
 @end menu
+@node Conditional Commands, Conditional Not Commands, Conditionals, Conditionals
-@node Conditional Commands
+@ifinfo
-@section Conditional Commands
+@heading Conditional Commands
+@end ifinfo
 @findex ifinfo
-@code{@@ifinfo} begins segments of text that should be ignored by @TeX{}
+@code{@@ifinfo} begins segments of text that should be ignored
-when it typesets the printed manual.  The segment of text appears only
+by @TeX{} when it
-in the Info file.  The @code{@@ifinfo} command should appear on a line
+typesets the printed manual.  The segment of text appears only
-by itself; end the Info-only text with a line containing @code{@@end
+in the Info file.
-ifinfo} by itself.  At the beginning of a Texinfo file, the Info
+The @code{@@ifinfo} command should appear on a line by itself;  end
-permissions are contained within a region marked by @code{@@ifinfo} and
+the Info-only text with a line containing @code{@@end ifinfo} by
-@code{@@end ifinfo}. (@xref{Info Summary and Permissions}.)
+itself.  At the beginning of a Texinfo file, the Info permissions are
+contained within a region marked by @code{@@ifinfo} and @code{@@end
+ifinfo}. (@xref{Info Summary and Permissions}.)@refill
 @findex iftex
 @findex ifhtml
 The @code{@@iftex} and @code{@@end iftex} commands are similar to the
 @code{@@ifinfo} and @code{@@end ifinfo} commands, except that they
 This text will appear only in the printed manual.
 @@end iftex
 @@ifinfo
 However, this text will appear only in Info.
 @@end ifinfo
-@@ifhtml
-And this text will only appear in HTML.
-@@end ifhtml
 @end example
 @noindent
 The preceding example produces the following line:
 @iftex
 This text will appear only in the printed manual.
 @end iftex
 @ifinfo
 However, this text will appear only in Info.
 @end ifinfo
-@ifhtml
-And this text will only appear in HTML.
+@noindent
-@end ifhtml
+Note how you only see one of the two lines, depending on whether you
+are reading the Info version or the printed version of this
-@noindent
+manual.@refill
-Notice that you only see one of the input lines, depending on which
-version of the manual you are reading.
+The @code{@@titlepage} command is a special variant of @code{@@iftex} that
+is used for making the title and copyright pages of the printed
+manual.  (@xref{titlepage, , @code{@@titlepage}}.) @refill
-@node Conditional Not Commands
+@node Conditional Not Commands, Raw Formatter Commands, Conditional Commands, Conditionals
 @section Conditional Not Commands
 @findex ifnothtml
 @findex ifnotinfo
 @findex ifnottex
 If the output file is not being made for the given format, the region is
 included.  Otherwise, it is ignored.
 The regions delimited by these commands are ordinary Texinfo source as
-with @code{@@iftex}, not raw formatter source as with @code{@@tex}
+with @code{@@iftex}, not raw formatter source as with @code{@@tex}.
-(@pxref{Raw Formatter Commands}).
 @node Raw Formatter Commands, set clear value, Conditional Not Commands, Conditionals
 @section Raw Formatter Commands
 @cindex @TeX{} commands, using ordinary
 @findex tex
 You can enter plain @TeX{} completely, and use @samp{\} in the @TeX{}
 commands, by delineating a region with the @code{@@tex} and @code{@@end
 tex} commands.  (The @code{@@tex} command also causes Info to ignore the
-region, like the @code{@@iftex} command.)  The sole exception is that the
+region, like the @code{@@iftex} command.)  The sole exception is that
-@code{@@} character still introduces a command, so that @code{@@end tex}
+@code{@@} chracter still introduces a command, so that @code{@@end tex}
 can be recognized properly.
 @cindex Mathematical expressions
 For example, here is a mathematical expression written in
 plain @TeX{}:
 @findex ifhtml
 @findex html
 Analogously, you can use @code{@@ifhtml @dots{} @@end ifhtml} to delimit
 a region to be included in HTML output only, and @code{@@html @dots{}
-@@end html} for a region of raw HTML (again, except that @code{@@} is
+@@end ifhtml} for a region of raw HTML (again, except that @code{@@} is
 still the escape character, so the @code{@@end} command can be
 recognized.)
-@node set clear value
+@node set clear value,  , Raw Formatter Commands, Conditionals
+@comment  node-name,  next,  previous,  up
 @section @code{@@set}, @code{@@clear}, and @code{@@value}
 You can direct the Texinfo formatting commands to format or ignore parts
 of a Texinfo file with the @code{@@set}, @code{@@clear}, @code{@@ifset},
 and @code{@@ifclear} commands.@refill
 @code{@@set}, for example, to set a date and use @code{@@value} to
 insert the date in several places in the Texinfo file.@refill
 @menu
 * ifset ifclear::               Format a region if a flag is set.
-* set value::                   Expand a flag variable to a string.
+* value::                       Replace a flag with a string.
 * value Example::               An easy way to update edition information.
 @end menu
-@node ifset ifclear
+@node ifset ifclear, value, set clear value, set clear value
 @subsection @code{@@ifset} and @code{@@ifclear}
 @findex ifset
 When a @var{flag} is set, the Texinfo formatting commands format text
 between subsequent pairs of @code{@@ifset @var{flag}} and @code{@@end
 ifset} commands.  When the @var{flag} is cleared, the Texinfo formatting
 commands do @emph{not} format the text.
 Use the @code{@@set @var{flag}} command to turn on, or @dfn{set}, a
-@var{flag}; a @dfn{flag} name can be any single word, containing
+@var{flag}; a @dfn{flag} can be any single word.  The format for the
-letters, numerals, hyphens, or underscores.
+command looks like this:@refill
-The format for the command looks like this:@refill
 @findex set
 @example
 @@set @var{flag}
 @end example
 If @var{flag} is cleared, tell the Texinfo formatting commands to
 format the text up to the following @code{@@end ifclear}
 command.@refill
 @end table
+@node value, value Example, ifset ifclear, set clear value
-@node set value
+@subsection @code{@@value}
-@subsection @code{@@set} and @code{@@value}
 @findex value
 You can use the @code{@@set} command to specify a value for a flag,
-which is expanded by the @code{@@value} command.  A flag is an
+which is expanded by the @code{@@value} command.  The value is a string
-identifier; for best results, use only letters and numerals in a flag
+a characters.
-name, not @samp{-} or @samp{_}---they will work in some contexts, but
-not all, due to limitations in @TeX{}.  The value is just a string of
-characters, the remainder of the input line.
 Write the @code{@@set} command like this:
 @example
 @@set foo This is a string.
 @end example
 @noindent
-This sets the value of the flag @code{foo} to ``This is a string.''.
+This sets the value of @code{foo} to ``This is a string.''
-The Texinfo formatters then replace an @code{@@value@{@var{flag}@}}
+The Texinfo formatters replace an @code{@@value@{@var{flag}@}} command with
-command with the string to which @var{flag} is set.  Thus, when
+the string to which @var{flag} is set.@refill
-@code{foo} is set as shown above, the Texinfo formatters convert
+Thus, when @code{foo} is set as shown above, the Texinfo formatters convert
 @example
 @group
 @@value@{foo@}
 @exdent @r{to}
 @end example
 @noindent
 without specifying a string, the value of @code{foo} is an empty string.
-If you clear a previously set flag with @code{@@clear @var{flag}}, a
+If you clear a previously set flag with an @code{@@clear @var{flag}}
-subsequent @code{@@value@{flag@}} command is invalid and the string is
+command, a subsequent @code{@@value@{flag@}} command is invalid and the
-replaced with an error message that says @samp{@{No value for
+string is replaced with an error message that says @samp{@{No value for
 "@var{flag}"@}}.
 For example, if you set @code{foo} as follows:@refill
 @example
 @exdent @r{into}
 It is a @{No value for "how-much"@} wet day.
 @end group
 @end example
+@node value Example,  , value, set clear value
-@node value Example
 @subsection @code{@@value} Example
 You can use the @code{@@value} command to limit the number of places you
-need to change when you record an update to a manual.  Here is how it is
+need to change when you record an update to a manual.
-done in @cite{The GNU Make Manual}:
+Here is how it is done in @cite{The GNU Make Manual}:
-@enumerate
+@need 1000
-@item
+@noindent
 Set the flags:
 @example
 @group
 @@set EDITION 0.35 Beta
 @@set UPDATED 14 August 1992
 @@set UPDATE-MONTH August 1992
 @end group
 @end example
-@item
+@need 750
+@noindent
 Write text for the first @code{@@ifinfo} section, for people reading the
 Texinfo file:
 @example
 @group
 This is Edition @@value@{EDITION@},
 last updated @@value@{UPDATED@},
 of @@cite@{The GNU Make Manual@},
-for @@code@{make@}, version @@value@{VERSION@}.
+for @@code@{make@}, Version @@value@{VERSION@}.
 @end group
 @end example
-@item
+@need 1000
+@noindent
 Write text for the title page, for people reading the printed manual:
 @c List only the month and the year since that looks less fussy on a
 @c printed cover than a date that lists the day as well.
 @example
 @noindent
 (On a printed cover, a date listing the month and the year looks less
 fussy than a date listing the day as well as the month and year.)
-@item
+@need 750
+@noindent
 Write text for the Top node, for people reading the Info file:
 @example
 @group
 This is Edition @@value@{EDITION@}
 last updated @@value@{UPDATED@}
 for @@code@{make@} Version @@value@{VERSION@}.
 @end group
 @end example
+@need 950
 After you format the manual, the text in the first @code{@@ifinfo}
 section looks like this:
 @example
 @group
 This is Edition 0.35 Beta, last updated 14 August 1992,
 of `The GNU Make Manual', for `make', Version 3.63 Beta.
 @end group
 @end example
-@end enumerate
 When you update the manual, change only the values of the flags; you do
-not need to edit the three sections.
+not need to rewrite the three sections.
-@node Internationalization
+@node Macros, Format/Print Hardcopy, Conditionals, Top
-@chapter Internationalization
+@chapter Macros: Defining New Texinfo Commands
-@cindex Internationalization
-Texinfo has some support for writing in languages other than English,
-although this area still needs considerable work.
-For a list of the various accented and special characters Texinfo
-supports, see @ref{Inserting Accents}.
-@menu
-* documentlanguage::            Declaring the current language.
-* documentencoding::            Declaring the input encoding.
-@end menu
-@node documentlanguage
-@section @code{@@documentlanguage @var{cc}}: Set the Document Language
-@findex documentlanguage
-@cindex Language, declaring
-@cindex Document language, declaring
-The @code{@@documentlanguage} command declares the current document
-language.  Write it on a line by itself, with a two-letter ISO-639
-language code following (list is included below).  If you have a
-multilingual document, the intent is to be able to use this command
-multiple times, to declare each language change.  If the command is not
-used at all, the default is @code{en} for English.
-@cindex @file{txi-@var{cc}.tex}
-At present, this command is ignored in Info and HTML output.  For
-@TeX{}, it causes the file @file{txi-@var{cc}.tex} to be read (if it
-exists).  Such a file appropriately redefines the various English words
-used in @TeX{} output, such as `Chapter', `See', and so on.
-@cindex Hyphenation patterns, language-dependent
-It would be good if this command also changed @TeX{}'s ideas of the
-current hyphenation patterns (via the @TeX{} primitive
-@code{\language}), but this is unfortunately not currently implemented.
-@cindex ISO 639 codes
-@cindex Language codes
-@cindex African languages
-Here is the list of valid language codes.  This list comes from
-@uref{http://www.iro.umontreal.ca/contrib/po/iso-639, the free
-translation project}.  In the future we may wish to allow the 3-letter
-POV codes described at @uref{http://www.sil.org/ethnologue/#contents}.
-This will be necessary to support African languages.
-@multitable @columnfractions .06 .27 .06 .27 .06 .27
-@item
-@code{aa} @tab Afar @tab
-@code{ab} @tab Abkhazian @tab
-@code{af} @tab Afrikaans
-@item
-@code{am} @tab Amharic @tab
-@code{ar} @tab Arabic @tab
-@code{as} @tab Assamese
-@item
-@code{ay} @tab Aymara @tab
-@code{az} @tab Azerbaijani @tab
-@code{ba} @tab Bashkir
-@item
-@code{be} @tab Byelorussian @tab
-@code{bg} @tab Bulgarian @tab
-@code{bh} @tab Bihari
-@item
-@code{bi} @tab Bislama @tab
-@code{bn} @tab Bengali; Bangla @tab
-@code{bo} @tab Tibetan
-@item
-@code{br} @tab Breton @tab
-@code{ca} @tab Catalan @tab
-@code{co} @tab Corsican
-@item
-@code{cs} @tab Czech @tab
-@code{cy} @tab Welsh @tab
-@code{da} @tab Danish
-@item
-@code{de} @tab German @tab
-@code{dz} @tab Bhutani @tab
-@code{el} @tab Greek
-@item
-@code{en} @tab English @tab
-@code{eo} @tab Esperanto @tab
-@code{es} @tab Spanish
-@item
-@code{et} @tab Estonian @tab
-@code{eu} @tab Basque @tab
-@code{fa} @tab Persian
-@item
-@code{fi} @tab Finnish @tab
-@code{fj} @tab Fiji @tab
-@code{fo} @tab Faroese
-@item
-@code{fr} @tab French @tab
-@code{fy} @tab Frisian @tab
-@code{ga} @tab Irish
-@item
-@code{gd} @tab Scots Gaelic @tab
-@code{gl} @tab Galician @tab
-@code{gn} @tab Guarani
-@item
-@code{gu} @tab Gujarati @tab
-@code{ha} @tab Hausa @tab
-@code{he} @tab Hebrew
-@item
-@code{hi} @tab Hindi @tab
-@code{hr} @tab Croatian @tab
-@code{hu} @tab Hungarian
-@item
-@code{hy} @tab Armenian @tab
-@code{ia} @tab Interlingua @tab
-@code{id} @tab Indonesian
-@item
-@code{ie} @tab Interlingue @tab
-@code{ik} @tab Inupiak @tab
-@code{is} @tab Icelandic
-@item
-@code{it} @tab Italian @tab
-@code{iu} @tab Inuktitut @tab
-@code{ja} @tab Japanese
-@item
-@code{jw} @tab Javanese @tab
-@code{ka} @tab Georgian @tab
-@code{kk} @tab Kazakh
-@item
-@code{kl} @tab Greenlandic @tab
-@code{km} @tab Cambodian @tab
-@code{kn} @tab Kannada
-@item
-@code{ks} @tab Kashmiri @tab
-@code{ko} @tab Korean @tab
-@code{ku} @tab Kurdish
-@item
-@code{ky} @tab Kirghiz @tab
-@code{la} @tab Latin @tab
-@code{ln} @tab Lingala
-@item
-@code{lt} @tab Lithuanian @tab
-@code{lo} @tab Laothian @tab
-@code{lv} @tab Latvian, Lettish
-@item
-@code{mg} @tab Malagasy @tab
-@code{mi} @tab Maori @tab
-@code{mk} @tab Macedonian
-@item
-@code{ml} @tab Malayalam @tab
-@code{mn} @tab Mongolian @tab
-@code{mo} @tab Moldavian
-@item
-@code{mr} @tab Marathi @tab
-@code{ms} @tab Malay @tab
-@code{mt} @tab Maltese
-@item
-@code{my} @tab Burmese @tab
-@code{na} @tab Nauru @tab
-@code{ne} @tab Nepali
-@item
-@code{nl} @tab Dutch @tab
-@code{no} @tab Norwegian @tab
-@code{oc} @tab Occitan
-@item
-@code{om} @tab (Afan) Oromo @tab
-@code{or} @tab Oriya @tab
-@code{pa} @tab Punjabi
-@item
-@code{pl} @tab Polish @tab
-@code{ps} @tab Pashto, Pushto @tab
-@code{pt} @tab Portuguese
-@item
-@code{qu} @tab Quechua @tab
-@code{rm} @tab Rhaeto-Romance @tab
-@code{rn} @tab Kirundi
-@item
-@code{ro} @tab Romanian @tab
-@code{ru} @tab Russian @tab
-@code{rw} @tab Kinyarwanda
-@item
-@code{sa} @tab Sanskrit @tab
-@code{sd} @tab Sindhi @tab
-@code{sg} @tab Sangro
-@item
-@code{sh} @tab Serbo-Croatian @tab
-@code{si} @tab Sinhalese @tab
-@code{sk} @tab Slovak
-@item
-@code{sl} @tab Slovenian @tab
-@code{sm} @tab Samoan @tab
-@code{sn} @tab Shona
-@item
-@code{so} @tab Somali @tab
-@code{sq} @tab Albanian @tab
-@code{sr} @tab Serbian
-@item
-@code{ss} @tab Siswati @tab
-@code{st} @tab Sesotho @tab
-@code{su} @tab Sundanese
-@item
-@code{sv} @tab Swedish @tab
-@code{sw} @tab Swahili @tab
-@code{ta} @tab Tamil
-@item
-@code{te} @tab Telugu @tab
-@code{tg} @tab Tajik @tab
-@code{th} @tab Thai
-@item
-@code{ti} @tab Tigrinya @tab
-@code{tk} @tab Turkmen @tab
-@code{tl} @tab Tagalog
-@item
-@code{tn} @tab Setswana @tab
-@code{to} @tab Tonga @tab
-@code{tr} @tab Turkish
-@item
-@code{ts} @tab Tsonga @tab
-@code{tt} @tab Tatar @tab
-@code{tw} @tab Twi
-@item
-@code{ug} @tab Uighur @tab
-@code{uk} @tab Ukrainian @tab
-@code{ur} @tab Urdu
-@item
-@code{uz} @tab Uzbek @tab
-@code{vi} @tab Vietnamese @tab
-@code{vo} @tab Volapuk
-@item
-@code{wo} @tab Wolof @tab
-@code{xh} @tab Xhosa @tab
-@code{yi} @tab Yiddish
-@item
-@code{yo} @tab Yoruba @tab
-@code{za} @tab Zhuang @tab
-@code{zh} @tab Chinese
-@item
-@code{zu} @tab Zulu
-@end multitable
-@node documentencoding
-@section @code{@@documentencoding @var{enc}}: Set Input Encoding
-@findex documentencoding
-@cindex Encoding, declaring
-@cindex Input encoding, declaring
-@cindex Document input encoding
-The @code{@@documentencoding} command declares the input document
-encoding.  Write it on a line by itself, with a valid encoding
-specification following, such as @samp{ISO-8859-1}.
-@cindex http-equiv, and charset
-@cindex meta HTML tag, and charset
-At present, this is used only in HTML output from @code{makeinfo}.  If a
-document encoding @var{enc} is specified, it is used in the
-@samp{<meta>} tag is included in the @samp{<head>} of the output:
-@example
-<meta http-equiv="Content-Type" content="text/html; charset=@var{enc}">
-@end example
-@node Defining New Texinfo Commands
-@chapter Defining New Texinfo Commands
 @cindex Macros
 @cindex Defining new Texinfo commands
 @cindex New Texinfo commands, defining
 @cindex Texinfo commands, defining new
 @cindex User-defined Texinfo commands
-Texinfo provides several ways to define new commands:
-@itemize @bullet
-@item
 A Texinfo @dfn{macro} allows you to define a new Texinfo command as any
 sequence of text and/or existing commands (including other macros).  The
 macro can have any number of @dfn{parameters}---text you supply each
-time you use the macro.
+time you use the macro.  (This has nothing to do with the
+@code{@@defmac} command, which is for documenting macros in the subject
-Incidentally, these macros have nothing to do with the @code{@@defmac}
+of the manual; @pxref{Def Cmd Template}.)
-command, which is for documenting macros in the subject of the manual
-(@pxref{Def Cmd Template}).
-@item
-@samp{@@alias} is a convenient way to define a new name for an existing
-command.
-@item
-@samp{@@definfoenclose} allows you to define new commands with
-customized output in the Info file.
-@end itemize
 @menu
-* Defining Macros::             Defining and undefining new commands.
+* Defining Macros::             Both defining and undefining new commands.
 * Invoking Macros::             Using a macro, once you've defined it.
-* Macro Details::               Beyond basic macro usage.
-* alias::                       Command aliases.
-* definfoenclose::              Customized highlighting.
 @end menu
-@node Defining Macros
+@node Defining Macros, Invoking Macros, Macros, Macros
 @section Defining Macros
 @cindex Defining macros
 @cindex Macro definitions
-@cindex Definitions, a.k.a.@: macros
 @findex macro
-You use the Texinfo @code{@@macro} command to define a macro, like this:
+You use the Texinfo @code{@@macro} command to define a macro.  For example:
 @example
-@@macro @var{macroname}@{@var{param1}, @var{param2}, @dots{}@}
+@@macro @var{macro-name}@{@var{param1}, @var{param2}, @dots{}@}
 @var{text} @dots{} \@var{param1}\ @dots{}
 @@end macro
 @end example
 The @dfn{parameters} @var{param1}, @var{param2}, @dots{} correspond to
 arguments supplied when the macro is subsequently used in the document
-(described in the next section).
+(see the next section).
-For a macro to work with @TeX{}, @var{macroname} must consist entirely
-of letters: no digits, hyphens, underscores, or other special characters.
 If a macro needs no parameters, you can define it either with an empty
 list (@samp{@@macro foo @{@}}) or with no braces at all (@samp{@@macro
 foo}).
 @cindex Body of a macro
 @cindex Mutually recursive macros
 @cindex Recursion, mutual
-The definition or @dfn{body} of the macro can contain most Texinfo
+The definition or @dfn{body} of the macro can contain any Texinfo
-commands, including previously-defined macros.  Not-yet-defined macro
+commands, including previously-defined macros.  (It is not possible to
-invocations are not allowed; thus, it is not possible to have mutually
+have mutually recursive Texinfo macros.)  In the body, instances of a
-recursive Texinfo macros.  Also, a macro definition that defines another
+parameter name surrounded by backslashes, as in @samp{\@var{param1}\} in
-macro does not work in @TeX{} due to limitations in the design of
+the example above, are replaced by the corresponding argument from the
-@code{@@macro}.
+macro invocation.
-@cindex Parameters to macros
-In the macro body, instances of a parameter name surrounded by
-backslashes, as in @samp{\@var{param1}\} in the example above, are
-replaced by the corresponding argument from the macro invocation.  You
-can use parameter names any number of times in the body, including zero.
-@cindex Backslash in macros
-To get a single @samp{\} in the macro expansion, use @samp{\\}.  Any
-other use of @samp{\} in the body yields a warning.
-@cindex Spaces in macros
-@cindex Whitespace in macros
-The newlines after the @code{@@macro} line and before the @code{@@end
-macro} line are ignored, that is, not included in the macro body.  All
-other whitespace is treated according to the usual Texinfo rules.
-@cindex Recursive macro invocations
-@findex rmacro
-To allow a macro to be used recursively, that is, in an argument to a
-call to itself, you must define it with @samp{@@rmacro}, like this:
-@example
-@@rmacro rmac
-a\arg\b
-@@end rmacro
-@dots{}
-@@rmac@{1@@rmac@{text@}2@}
-@end example
-This produces the output `a1atextb2b'.  With @samp{@@macro} instead of
-@samp{@@rmacro}, an error message is given.
 @findex unmacro
 @cindex Macros, undefining
 @cindex Undefining macros
 You can undefine a macro @var{foo} with @code{@@unmacro @var{foo}}.
 @example
 @@unmacro foo
 @end example
-@node Invoking Macros
+@node Invoking Macros,  , Defining Macros, Macros
 @section Invoking Macros
 @cindex Invoking macros
-@cindex Expanding macros
-@cindex Running macros
 @cindex Macro invocation
 After a macro is defined (see the previous section), you can use
 (@dfn{invoke}) it in your document like this:
 @example
-@@@var{macroname} @{@var{arg1}, @var{arg2}, @dots{}@}
+@@@var{macro-name} @{@var{arg1}, @var{arg2}, @dots{}@}
 @end example
-@noindent and the result will be just as if you typed the body of
+@noindent
-@var{macroname} at that spot.  For example:
+and the result will be just as if you typed the body of
+@var{macro-name} at that spot.  For example:
 @example
 @@macro foo @{p, q@}
 Together: \p\ & \q\.
 @@end macro
 @@foo@{a, b@}
 @end example
-@noindent produces:
+@noindent
+produces:
 @display
 Together: a & b.
 @end display
 @cindex Backslash, and macros
 Thus, the arguments and parameters are separated by commas and delimited
-by braces; any whitespace after (but not before) a comma is ignored.
+by braces; any whitespace after (but not before) a comma is ignored.  To
-The braces are required in the invocation (but not the definition), even
+insert a comma, brace, or backslash in an argument, prepend a backslash,
-when the macro takes no arguments, consistent with all other Texinfo
+as in
-commands.  For example:
+@example
-@example
+@@@var{macro-name} @{\\\@{\@}\,@}
-@@macro argless @{@}
-No arguments here.
-@@end macro
-@@argless@{@}
-@end example
-@noindent produces:
-@display
-No arguments here.
-@end display
-To insert a comma, brace, or backslash in an argument, prepend a
-backslash, as in
-@example
-@@@var{macname} @{\\\@{\@}\,@}
 @end example
 @noindent
 which will pass the (almost certainly error-producing) argument
-@samp{\@{@},} to @var{macname}.
+@samp{\@{@},} to @var{macro-name}.
 If the macro is defined to take a single argument, and is invoked
 without any braces, the entire rest of the line after the macro name is
 supplied as the argument.  For example:
 @example
 @@macro bar @{p@}
-Twice: \p\ & \p\.
+Twice: \p\, \p\.
 @@end macro
 @@bar aah
 @end example
-@noindent produces:
+@noindent
+produces:
-@c Sorry for cheating, but let's not require macros to process the manual.
 @display
-Twice: aah & aah.
+Twice: aah, aah.
 @end display
-If the macro is defined to take a single argument, and is invoked with
-braces, the braced text is passed as the argument, regardless of
+@node Format/Print Hardcopy, Create an Info File, Macros, Top
-commas.  For example:
+@comment  node-name,  next,  previous,  up
+@chapter Format and Print Hardcopy
-@example
-@@macro bar @{p@}
-Twice: \p\ & \p\.
-@@end macro
-@@bar@{a,b@}
-@end example
-@noindent produces:
-@display
-Twice: a,b & a,b.
-@end display
-@node Macro Details
-@section Macro Details
-@cindex Macro details
-@cindex Details of macro usage
-Due to unavoidable disparities in the @TeX{} and @command{makeinfo}
-implementations, Texinfo macros have the following limitations.
-@itemize @bullet
-@item
-All macros are expanded inside at least one @TeX{} group.  This means
-that @set and other such commands will have no effect inside a macro.
-@item
-Macros containing a command which must be on a line by itself, such as a
-conditional, cannot be invoked in the middle of a line.
-@item
-The @TeX{} implementation cannot construct macros that define macros in
-the natural way.  To do this, you must use conditionals and raw @TeX{}.
-For example:
-@example
-@@ifinfo
-@@macro ctor @{name, arg@}
-@@macro \name\
-something involving \arg\ somehow
-@@end macro
-@@end macro
-@@end ifinfo
-@@tex
-\gdef\ctor#1@{\ctorx#1,@}
-\gdef\ctorx#1,#2,@{\def#1@{something involving #2 somehow@}@}
-@@end tex
-@end example
-@item
-It is best to avoid comments inside macro definitions.
-@end itemize
-@node alias
-@section @samp{@@alias @var{new}=@var{existing}}
-@cindex Aliases, command
-@cindex Command aliases
-@findex alias
-The @samp{@@alias} command defines a new command to be just like an
-existing one.  This is useful for defining additional markup names, thus
-preserving semantic information in the input even though the output
-result may be the same.
-Write the @samp{@@alias} command on a line by itself, followed by the
-new command name, an equals sign, and the existing command name.
-Whitespace around the equals sign is ignored.  Thus:
-@example
-@@alias @var{new} = @var{existing}
-@end example
-For example, if your document contains citations for both books and
-some other media (movies, for example), you might like to define a
-macro @code{@@moviecite@{@}} that does the same thing as an ordinary
-@code{@@cite@{@}} but conveys the extra semantic information as well.
-You'd do this as follows:
-@example
-@@alias moviecite = cite
-@end example
-Macros do not always have the same effect due to vagaries of argument
-parsing.  Also, aliases are much simpler to define than macros.  So the
-command is not redundant.  (It was also heavily used in the Jargon File!)
-Aliases must not be recursive, directly or indirectly.
-@node definfoenclose
-@section @samp{definfoenclose}: Customized Highlighting
-@cindex Highlighting, customized
-@cindex Customized highlighting
-@findex definfoenclose
-A @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
-@file{texinfo.tex}, @file{texinfo.cnf}, or within an @samp{@@iftex} in
-your document.
-Write a @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 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 a @code{@@definfoenclose} on the name of a pre-defined macro
-(such as @code{@@emph}, @code{@@strong}, @code{@@t}, or @code{@@i}), the
-enclosure definition will override the built-in definition.
-An enclosure command defined this way takes one argument in braces; this
-is intended for new markup commands (@pxref{Marking Text}).
-@findex phoo
-For example, you can write:
-@example
-@@definfoenclose phoo,//,\\
-@end example
-@noindent
-near the beginning of a Texinfo file to define @code{@@phoo} as an Info
-formatting command that inserts `//' before and `\\' after the argument
-to @code{@@phoo}.  You can then write @code{@@phoo@{bar@}} wherever you
-want `//bar\\' highlighted in Info.
-Also, for TeX formatting, you could write
-@example
-@@iftex
-@@global@@let@@phoo=@@i
-@@end iftex
-@end example
-@noindent
-to define @code{@@phoo} as a command that causes TeX to typeset the
-argument to @code{@@phoo} in italics.
-Note that each definition applies to its own formatter: one for TeX,
-the other for @code{texinfo-format-buffer} or
-@code{texinfo-format-region}.  The @code{@@definfoenclose} command need
-not be within @samp{@@ifinfo}, but the raw @TeX{} commands do need to be
-in @samp{@@iftex}.
-@findex headword
-Here is another example: write
-@example
-@@definfoenclose headword, , :
-@end example
-@noindent
-near the beginning of the file, to define @code{@@headword} as an Info
-formatting command that inserts nothing before and a colon after the
-argument to @code{@@headword}.
-@samp{@@definfoenclose} definitions must not be recursive, directly or
-indirectly.
-@node Hardcopy
-@chapter Formatting and Printing Hardcopy
 @cindex Format and print hardcopy
-@cindex Printing hardcopy
 @cindex Hardcopy, printing it
 @cindex Making a printed manual
 @cindex Sorting indices
 @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.
+inside GNU Emacs.@refill
 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
 format a file, sort the indices, and print the result, Texinfo mode
 offers key bindings for commands to recenter the output buffer, show the
-print queue, and delete a job from the print queue.
+print queue, and delete a job from the print queue.@refill
 @menu
 * Use TeX::                     Use @TeX{} to format for hardcopy.
-* Format with tex/texindex::    How to format with explicit shell commands.
+* Format with tex/texindex::    How to format in a shell.
-* Format with texi2dvi::        A simpler way to format.
+* Format with texi2dvi::        A simpler way to use the shell.
 * 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.
 * Compile-Command::             How to print using Emacs's compile command.
 * Requirements Summary::        @TeX{} formatting requirements summary.
-* Preparing for TeX::           What to do before you use @TeX{}.
+* Preparing for TeX::           What you need to do to use @TeX{}.
 * Overfull hboxes::             What are and what to do with overfull hboxes.
 * smallbook::                   How to print small format books and manuals.
 * A4 Paper::                    How to print on European A4 paper.
-* 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.
 @end menu
-@node Use TeX
+@node Use TeX, Format with tex/texindex, Format/Print Hardcopy, Format/Print Hardcopy
-@section Use @TeX{}
+@ifinfo
+@heading Use @TeX{}
+@end ifinfo
 The typesetting program called @TeX{} is used for formatting a Texinfo
-file.  @TeX{} is a very powerful typesetting program and, if used correctly,
+file.  @TeX{} is a very powerful typesetting program and, if used right,
 does an exceptionally good job.  (@xref{Obtaining TeX, , How to Obtain
 @TeX{}}, for information on how to obtain @TeX{}.)
 The @code{makeinfo}, @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}).
+make an Info file; see @ref{Create an Info File}.@refill
+@node Format with tex/texindex, Format with texi2dvi, Use TeX, Format/Print Hardcopy
-@node Format with tex/texindex
+@comment  node-name,  next,  previous,  up
-@section Format with @code{tex} and @code{texindex}
+@section Format using @code{tex} and @code{texindex}
 @cindex Shell formatting with @code{tex} and @code{texindex}
 @cindex Formatting with @code{tex} and @code{texindex}
 @cindex DVI file
 Format the Texinfo file with the shell command @code{tex} followed by
 @example
 tex foo.texi
 @end example
-@noindent @TeX{} will produce a @dfn{DVI file} as well as several auxiliary
+@noindent
+@TeX{} will produce a @dfn{DVI file} as well as several auxiliary
 files containing information for indices, cross references, etc.  The
 DVI file (for @dfn{DeVice Independent} file) can be printed on virtually
-any device (see the following sections).
+any printe (see the following sections).
 @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; see @ref{Format with texi2dvi,,
-Format with @code{texi2dvi}}.)  To generate a printed index after
+Format using @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
 @file{texindex.c} comes as part of the standard Texinfo distribution,
 among other places.)@refill
 @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
 @file{foo.texinfo} would be @file{foo.cp}, @file{foo.vr}, @file{foo.fn},
 @file{foo.tp}, @file{foo.pg} and @file{foo.ky}.  Those are exactly the
-arguments to give to @code{texindex}.
+arguments to give to @code{texindex}.@refill
 @need 1000
 @cindex Wildcards
 @cindex Globbing
 Instead of specifying all the unsorted index file names explicitly, you
 can use @samp{??} as shell wildcards and give the command in this
-form:
+form:@refill
 @example
 texindex foo.??
 @end example
 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.)
+command reports but otherwise ignores such files.)@refill
 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
-@code{@@printindex} command looks for a file with that name
+@code{@@printindex} command knows to look for a file of that name
 (@pxref{Printing Indices & Menus}).  @code{texindex} does not alter the
-raw index output file.
+raw index output file.@refill
 After you have sorted the indices, you need to rerun the @code{tex}
 formatting command on the Texinfo file.  This regenerates the DVI file,
 this time with up-to-date index entries.
 Finally, you may need to run @code{tex} one more time, to get the page
 numbers in the cross-references correct.
-To summarize, this is a five step process:
+To summarize, this is a four step process:
 @enumerate
 @item
 Run @code{tex} on your Texinfo file.  This generates a DVI file (with
 undefined cross-references and no indices), and the raw index files
 Run @code{tex} again on your Texinfo file.  This regenerates the DVI
 file, this time with indices and defined cross-references, but with page
 numbers for the cross-references from last time, generally incorrect.
 @item
-Sort the indices again, with @code{texindex}.
-@item
 Run @code{tex} one last time.  This time the correct page numbers are
 written for the cross-references.
 @end enumerate
 @pindex texi2dvi
-Alternatively, it's a one-step process: run @code{texi2dvi}
+Alternatively, it's a one-step process: run @code{texi2dvi}.
-(@pxref{Format with 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
 whatever sorted index files happen to exist from the previous use of
-@code{texindex}.  This is usually ok while you are debugging.
+@code{texindex}.  This is usually ok while you are
+debugging.@refill
-@cindex Auxiliary files, avoiding
-@findex novalidate
-@cindex Pointer validation, suppressing
+@node Format with texi2dvi, Print with lpr, Format with tex/texindex, Format/Print Hardcopy
-@cindex Chapters, formatting one at a time
+@comment  node-name,  next,  previous,  up
-Sometimes you may wish to print a document while you know it is
+@section Format using @code{texi2dvi}
-incomplete, or to print just one chapter of a document.  In that case,
-the usual auxiliary files that @TeX{} creates and warnings @TeX{} gives
-when cross-references are not satisfied are just nuisances.  You can
-avoid them with the @code{@@novalidate} command, which you must give
-@emph{before} the @code{@@setfilename} command
-(@pxref{setfilename,,@code{@@setfilename}}).  Thus, the beginning of
-your file would look approximately like this:
-@example
-\input texinfo
-@@novalidate
-@@setfilename myfile.info
-@dots{}
-@end example
-@noindent @code{@@novalidate} also turns off validation in
-@code{makeinfo}, just like its @code{--no-validate} option
-(@pxref{Pointer Validation}).
-@node Format with texi2dvi
-@section Format with @code{texi2dvi}
 @pindex texi2dvi @r{(shell script)}
 The @code{texi2dvi} command automatically runs both @code{tex} and
 @code{texindex} as many times as necessary to produce a DVI file with
-sorted indices and all cross-references resolved.  It simplifies the
+up-to-date, sorted indices.  It simplifies the
-@code{tex}---@code{texindex}---@code{tex}---@code{tex} sequence
+@code{tex}---@code{texindex}---@code{tex} sequence described in the
-described in the previous section.
+previous section.
-To run @code{texi2dvi} on an input file @file{foo.texi}, do this (where
+The syntax for @code{texi2dvi} is like this (where @samp{prompt$} is your
-@samp{prompt$ } is your shell prompt):
+shell prompt):@refill
 @example
-prompt$ @kbd{texi2dvi foo.texi}
+prompt$ @kbd{texi2dvi @var{filename}@dots{}}
 @end example
-As shown in this example, the input filenames to @code{texi2dvi} must
+For a list of options, run @samp{texi2dvi --help}.
-include any extension (@samp{.texi}, @samp{.texinfo}, etc.).  Under
-MS-DOS and perhaps in other circumstances, you may need to run @samp{sh
-texi2dvi foo.texi} instead of relying on the operating system to invoke
+@node Print with lpr, Within Emacs, Format with texi2dvi, Format/Print Hardcopy
-the shell on the @samp{texi2dvi} script.
+@comment  node-name,  next,  previous,  up
-Perhaps the most useful option to @code{texi2dvi} is
-@samp{--texinfo=@var{cmd}}.  This inserts @var{cmd} on a line by itself
-after the @code{@@setfilename} in a temporary copy of the input file
-before running @TeX{}.  With this, you can specify different printing
-formats, such as @code{@@smallbook} (@pxref{smallbook}),
-@code{@@afourpaper} (@pxref{A4 Paper}), or @code{@@pageparams}
-(@pxref{pagesizes}), without actually changing the document source.
-(You can also do this on a site-wide basis with @file{texinfo.cnf};
-@pxref{Preparing for TeX,,Preparing for @TeX{}}).
-For a list of other options, run @samp{texi2dvi --help}.
-@node Print with lpr, Within Emacs, Format with texi2dvi, Hardcopy
 @section Shell Print Using @code{lpr -d}
 @pindex lpr @r{(DVI print command)}
 The precise command to print a DVI file depends on your system
 installation, but @samp{lpr -d} is common.  The command may require the
 DVI file name without any extension or with a @samp{.dvi}
 extension.  (If it is @samp{lpr}, you must include the @samp{.dvi}.)
-For example, the following commands, will (perhaps) suffice to sort the
+The following commands, for example, will (probably) suffice to sort the
 indices, format, and print the @cite{Bison Manual}:
 @example
 @group
 tex bison.texinfo
 texi2dvi bison.texinfo
 lpr -d bison.dvi
 @end group
 @end example
-@cindex Shell printing, on MS-DOS/MS-Windows
+@node Within Emacs, Texinfo Mode Printing, Print with lpr, Format/Print Hardcopy
-@cindex Printing DVI files, on MS-DOS/MS-Windows
+@comment  node-name,  next,  previous,  up
-@pindex lpr@r{-d, replacements on MS-DOS/MS-Windows}
-@code{lpr} is a standard program on Unix systems, but it is usually
-absent on MS-DOS/MS-Windows.  Some network packages come with a
-program named @code{lpr}, but these are usually limited to sending files
-to a print server over the network, and generally don't support the
-@samp{-d} option.  If you are unfortunate enough to work on one of these
-systems, you have several alternative ways of printing DVI files:
-@itemize @bullet{}
-@item Find and install a Unix-like @code{lpr} program, or its clone.
-If you can do that, you will be able to print DVI files just like
-described above.
-@item Send the DVI files to a network printer queue for DVI files.
-Some network printers have special queues for printing DVI files.  You
-should be able to set up your network software to send files to that
-queue.  In some cases, the version of @code{lpr} which comes with your
-network software will have a special option to send a file to specific
-queues, like this:
-@example
-lpr -Qdvi -hprint.server.domain bison.dvi
-@end example
-@item Convert the DVI file to a Postscript or PCL file and send it to your
-local printer.  @xref{dvips invocation,,, dvips, Dvips}, and the man
-pages for @code{dvilj}, for detailed description of these tools.  Once
-the DVI file is converted to the format your local printer understands
-directly, just send it to the appropriate port, usually @samp{PRN}.
-@end itemize
-@node Within Emacs
 @section From an Emacs Shell
 @cindex Print, format from Emacs shell
 @cindex Format, print from Emacs shell
 @cindex Shell, format, print from
 @cindex Emacs shell, format, print from
 @cindex GNU Emacs shell, format, print from
 You can give formatting and printing commands from a shell within GNU
 Emacs.  To create a shell within Emacs, type @kbd{M-x shell}.  In this
-shell, you can format and print the document.  @xref{Hardcopy, , Format
+shell, you can format and print the document.  @xref{Format/Print
-and Print Hardcopy}, for details.
+Hardcopy, , Format and Print Hardcopy}, for details.@refill
 You can switch to and from the shell buffer while @code{tex} is
 running and do other editing.  If you are formatting a long document
 on a slow machine, this can be very convenient.@refill
 @xref{Texinfo Mode Printing}, for more information about formatting
 and printing in Texinfo mode.@refill
 @end ifinfo
+@node Texinfo Mode Printing, Compile-Command, Within Emacs, Format/Print Hardcopy
-@node Texinfo Mode Printing, Compile-Command, Within Emacs, Hardcopy
 @section Formatting and Printing in Texinfo Mode
 @cindex Region printing in Texinfo mode
 @cindex Format and print in Texinfo mode
 @cindex Print and format in Texinfo mode
 number shown by a preceding @kbd{C-c C-t C-q} command
 (@code{texinfo-show-tex-print-queue}).@refill
 @item C-c C-t C-k
 @itemx M-x tex-kill-job
-Kill the currently running @TeX{} job started by either
+Kill the currently running @TeX{} job started by
 @code{texinfo-tex-region} or @code{texinfo-tex-buffer}, or any other
 process running in the Texinfo shell buffer.@refill
 @item C-c C-t C-x
 @itemx M-x texinfo-quit-job
 @end group
 @end example
 You can change the values of these variables with the @kbd{M-x
 edit-options} command (@pxref{Edit Options, , Editing Variable Values,
-emacs, The GNU Emacs Manual}), with the @kbd{M-x set-variable} command
+xemacs, XEmacs User's Manual}), with the @kbd{M-x set-variable} command
-(@pxref{Examining, , Examining and Setting Variables, emacs, The GNU
+(@pxref{Examining, , Examining and Setting Variables, xemacs, XEmacs
-Emacs Manual}), or with your @file{.emacs} initialization file
+User's Manual}), or with your @file{.emacs} initialization file
-(@pxref{Init File, , , emacs, The GNU Emacs Manual}).@refill
+(@pxref{Init File, , , xemacs, XEmacs User's Manual}).@refill
-@cindex Customize Emacs package
+@node Compile-Command, Requirements Summary, Texinfo Mode Printing, Format/Print Hardcopy
-@findex Development/Docs/Texinfo Customize group
+@comment  node-name,  next,  previous,  up
-Beginning with version 20, GNU Emacs offers a user-friendly interface,
-called @dfn{Customize}, for changing values of user-definable variables.
-@xref{Easy Customization, , Easy Customization Interface, emacs, The GNU
-Emacs Manual}, for more details about this.  The Texinfo variables can
-be found in the @samp{Development/Docs/Texinfo} group, once you invoke
-the @kbd{M-x customize} command.
-@node Compile-Command, Requirements Summary, Texinfo Mode Printing, Hardcopy
 @section Using the Local Variables List
 @cindex Local variables
 @cindex Compile command for formatting
 @cindex Format with the compile command
 @end group
 @end example
 @noindent
 This technique is most often used by programmers who also compile programs
-this way; see @ref{Compilation, , , emacs, The GNU Emacs Manual}.@refill
+this way; see @ref{Compilation, , , xemacs, XEmacs User's Manual}.@refill
-@node Requirements Summary
+@node Requirements Summary, Preparing for TeX, Compile-Command, Format/Print Hardcopy
+@comment  node-name,  next,  previous,  up
 @section @TeX{} Formatting Requirements Summary
 @cindex Requirements for formatting
 @cindex Minimal requirements for formatting
 @cindex Formatting requirements
 Every Texinfo file that is to be input to @TeX{} must begin with a
 @code{\input} command and must contain an @code{@@setfilename} command:
 @example
 \input texinfo
-@@setfilename @var{arg-not-used-by-@TeX{}}
+@@setfilename @var{arg-not-used-by-@@TeX@{@}}
 @end example
 @noindent
 The first command instructs @TeX{} to load the macros it needs to
 process a Texinfo file and the second command opens auxiliary files.
 @example
 @@bye
 @end example
 Strictly speaking, these lines are all a Texinfo file needs to be
 processed successfully by @TeX{}.
 Usually, however, the beginning includes an @code{@@settitle} command to
 define the title of the printed manual, an @code{@@setchapternewpage}
 command, a title page, a copyright page, and permissions.  Besides an
 @code{@@bye}, the end of a file usually includes indices and a table of
 contents.  (And of course most manuals contain a body of text as well.)
-For more information, see:
+@iftex
-@itemize @bullet
+For more information, see
-@item @ref{settitle, , @code{@@settitle}}
+@ref{settitle, , @code{@@settitle}},
-@item @ref{setchapternewpage, , @code{@@setchapternewpage}}
+@ref{setchapternewpage, , @code{@@setchapternewpage}},
-@item @ref{Headings, ,Page Headings}
+@ref{Headings, ,Page Headings},
-@item @ref{Titlepage & Copyright Page}
+@ref{Titlepage & Copyright Page},
-@item @ref{Printing Indices & Menus}
+@ref{Printing Indices & Menus}, and
-@item @ref{Contents}
+@ref{Contents}.
-@end itemize
+@end iftex
+@noindent
+@ifinfo
-@node Preparing for TeX
+For more information, see@*
-@section Preparing for @TeX{}
+@ref{settitle, , @code{@@settitle}},@*
-@cindex Preparing for @TeX{}
+@ref{setchapternewpage, , @code{@@setchapternewpage}},@*
+@ref{Headings, ,Page Headings},@*
+@ref{Titlepage & Copyright Page},@*
+@ref{Printing Indices & Menus}, and@*
+@ref{Contents}.
+@end ifinfo
+@node Preparing for TeX, Overfull hboxes, Requirements Summary, Format/Print Hardcopy
+@comment  node-name,  next,  previous,  up
+@section Preparing to Use @TeX{}
+@cindex Preparing to use @TeX{}
 @cindex @TeX{} input initialization
 @cindex @code{TEXINPUTS} environment variable
 @vindex TEXINPUTS
 @cindex @b{.profile} initialization file
 @cindex @b{.cshrc} initialization file
 @pindex texinfo.cnf @r{installation}
 @cindex Customizing of @TeX{} for Texinfo
 @cindex Site-wide Texinfo configuration file
 Optionally, you may create an additional @file{texinfo.cnf}, and install
-it as well.  This file is read by @TeX{} when the @code{@@setfilename}
+it as well.  This file is read by @TeX{} at the @code{@@setfilename}
-command is executed (@pxref{setfilename,, @code{@@setfilename}}).  You can put any
+command (@pxref{setfilename,, @code{@@setfilename}}).  You can put any
-commands you like there, according to local site-wide conventions.  They
+commands you like there according to local site-wide conventions, and
-will be read by @TeX{} when processing any Texinfo document.  For
+they will be read by @TeX{} when processing any Texinfo document.  For
-example, if @file{texinfo.cnf} contains the line @samp{@@afourpaper}
+example, if @file{texinfo.cnf} contains the a single line
-(@pxref{A4 Paper}), then all Texinfo documents will be processed with
+@samp{@@afourpaper} (@pxref{A4 Paper}), then all Texinfo documents will
-that page size in effect.  If you have nothing to put in
+be processed with that page size in effect.  If you have nothing to put
-@file{texinfo.cnf}, you do not need to create it.
+in @file{texinfo.cnf}, you do not need to create it.
 @vindex TEXINPUTS
 If neither of the above locations for these system files suffice for
 you, you can specify the directories explicitly.  For
 @file{texinfo.tex}, you can do this by writing the complete path for the
 TEXINPUTS=.:/home/me/mylib:/usr/lib/tex/macros
 export TEXINPUTS
 @end group
 @end example
-On MS-DOS/MS-Windows, you would say it like this@footnote{Note the use
+@noindent
-of the @samp{;} character, instead of @samp{:}, as directory separator
+This would cause @TeX{} to look for @file{\input} file first in the current
-on these systems.}:
+directory, indicated by the @samp{.}, then in a hypothetical user's
+@file{me/mylib} directory, and finally in a system directory.
-@example
-@group
-set TEXINPUTS=.;d:/home/me/mylib;c:/usr/lib/tex/macros
+@node Overfull hboxes, smallbook, Preparing for TeX, Format/Print Hardcopy
-@end group
+@comment  node-name,  next,  previous,  up
-@end example
-@noindent
-It is customary for DOS/Windows users to put such commands in the
-@file{autoexec.bat} file, or in the Windows Registry.@refill
-@noindent
-These settings would cause @TeX{} to look for @file{\input} file first
-in the current directory, indicated by the @samp{.}, then in a
-hypothetical user's @file{me/mylib} directory, and finally in a system
-directory @file{/usr/lib/tex/macros}.
-@cindex Dumping a .fmt file
-@cindex Format file, dumping
-Finally, you may wish to dump a @file{.fmt} file (@pxref{Memory dumps,,,
-web2c, Web2c}) so that @TeX{} can load Texinfo faster.  (The
-disadvantage is that then updating @file{texinfo.tex} requires
-redumping.)  You can do this by running this command, assuming
-@file{epsf.tex} is findable by @TeX{}:
-@example
-initex texinfo @@dump
-@end example
-(@code{@@dump} is a @TeX{} primitive.)  You'll then need to move
-@file{texinfo.fmt} to wherever your @code{.fmt} files are found;
-typically this will be in the subdirectory @file{web2c} of your @TeX{}
-installation, for example, @file{/usr/local/share/tex/web2c}.
-@node Overfull hboxes
 @section Overfull ``hboxes''
 @cindex Overfull @samp{hboxes}
 @cindex @samp{hboxes}, overfull
 @cindex Final output
 @TeX{} is sometimes unable to typeset a line without extending it into
 the right margin.  This can occur when @TeX{} comes upon what it
 interprets as a long word that it cannot hyphenate, such as an
 electronic mail network address or a very long title.  When this
-happens, @TeX{} prints an error message like this:
+happens, @TeX{} prints an error message like this:@refill
 @example
-Overfull @@hbox (20.76302pt too wide)
+Overfull \hbox (20.76302pt too wide)
 @end example
-@findex hbox
 @noindent
 (In @TeX{}, lines are in ``horizontal boxes'', hence the term, ``hbox''.
-@samp{@@hbox} is a @TeX{} primitive not needed in the Texinfo language.)
+The backslash, @samp{\}, is the @TeX{} equivalent of @samp{@@}.)@refill
 @TeX{} also provides the line number in the Texinfo source file and
 the text of the offending line, which is marked at all the places that
-@TeX{} considered hyphenation.
+@TeX{} knows how to hyphenate words.
 @xref{Debugging with TeX, , Catching Errors with @TeX{} Formatting},
-for more information about typesetting errors.
+for more information about typesetting errors.@refill
 If the Texinfo file has an overfull hbox, you can rewrite the sentence
 so the overfull hbox does not occur, or you can decide to leave it.  A
 small excursion into the right margin often does not matter and may not
-even be noticeable.
+even be noticeable.@refill
-If you have many overfull boxes and/or an antipathy to rewriting, you
-can coerce @TeX{} into greatly increasing the allowable interword
-spacing, thus (if you're lucky) avoiding many of the bad line breaks,
-like this:
-@findex \emergencystretch
-@example
-@@tex
-\global\emergencystretch = .9\hsize
-@@end tex
-@end example
-@noindent
-(You can adjust the fraction as needed.)  This huge value for
-@code{\emergencystretch} cannot be the default, since then the typeset
-output would generally be of noticeably lower quality.  The default
-value is @samp{.15\hsize}.  @code{\hsize} is the @TeX{} dimension
-containing the current line width.
 @cindex Black rectangle in hardcopy
-@cindex Rectangle, black in hardcopy
+@cindex Rectangle, ugly, black in hardcopy
-@cindex Box, ugly black in hardcopy
+However, unless told otherwise, @TeX{} will print a large, ugly, black
-@cindex Ugly black rectangles in hardcopy
+rectangle beside the line that contains the overfull hbox.  This is so
-For what overfull boxes you have, however, @TeX{} will print a large,
+you will notice the location of the problem if you are correcting a
-ugly, black rectangle beside the line that contains the overfull hbox
+draft.@refill
-unless told otherwise.  This is so you will notice the location of the
-problem if you are correcting a draft.
+@need 1000
 @findex finalout
 To prevent such a monstrosity from marring your final printout, write
 the following in the beginning of the Texinfo file on a line of its own,
-before the @code{@@titlepage} command:
+before the @code{@@titlepage} command:@refill
 @example
 @@finalout
 @end example
+@node smallbook, A4 Paper, Overfull hboxes, Format/Print Hardcopy
-@node smallbook
+@comment  node-name,  next,  previous,  up
 @section Printing ``Small'' Books
 @findex smallbook
 @cindex Small book size
 @cindex Book, printing small
 @cindex Page sizes for books
 @example
 @@smallbook
 @end example
 @noindent
-(Since many books are about 7 by 9.25 inches, this command might better
+(Since regular sized books are often about 7 by 9.25 inches, this
-have been called the @code{@@regularbooksize} command, but it came to be
+command might better have been called the @code{@@regularbooksize}
-called the @code{@@smallbook} command by comparison to the 8.5 by 11 inch format.)
+command, but it came to be called the @code{@@smallbook} command by
+comparison to the 8.5 by 11 inch format.)@refill
 If you write the @code{@@smallbook} command between the
 start-of-header and end-of-header lines, the Texinfo mode @TeX{}
 region formatting command, @code{texinfo-tex-region}, will format the
 region in ``small'' book size (@pxref{Start of Header}).@refill
-@xref{small}, for information about
+The Free Software Foundation distributes printed copies of @cite{The GNU
-commands that make it easier to produce examples for a smaller manual.
+Emacs Manual} and other manuals in the ``small'' book size.
+@xref{smallexample & smalllisp, , @code{@@smallexample} and
-@xref{Format with texi2dvi}, and @ref{Preparing for TeX,,Preparing for
+@code{@@smalllisp}}, for information about commands that make it easier
-@TeX{}}, for other ways to format with @code{@@smallbook} that do not
+to produce examples for a smaller manual.@refill
-require changing the source file.
+Alternatively, to avoid embedding this physical paper size in your
+document, use @code{texi2dvi} to format your document (@pxref{Format
-@node A4 Paper
+with texi2dvi}), and supply @samp{-t @@smallbook} as an argument.  Then
+other people do not have to change the document source file to format it
+differently.
+@node A4 Paper, Cropmarks and Magnification, smallbook, Format/Print Hardcopy
+@comment  node-name,  next,  previous,  up
 @section Printing on A4 Paper
 @cindex A4 paper, printing on
 @cindex Paper size, European A4
 @cindex European A4 paper
 @findex afourpaper
-You can tell @TeX{} to format a document for printing on European size
+You can tell @TeX{} to typeset a document for printing on European size
 A4 paper with the @code{@@afourpaper} command.  Write the command on a
-line by itself near the beginning of the Texinfo file, before the title
+line by itself between @code{@@iftex} and @code{@@end iftex} lines near
-page.  For example, this is how you would write the header for this
+the beginning of the Texinfo file, before the title page:@refill
-manual:
+For example, this is how you would write the header for this manual:@refill
 @example
 @group
 \input texinfo    @@c -*-texinfo-*-
 @@c %**start of header
 @@setfilename texinfo
 @@settitle Texinfo
+@@syncodeindex vr fn
+@@iftex
 @@afourpaper
+@@end iftex
 @@c %**end of header
 @end group
 @end example
-@xref{Format with texi2dvi}, and @ref{Preparing for TeX,,Preparing for
+Alternatively, to avoid embedding this physical paper size in your
-@TeX{}}, for other ways to format with @code{@@afourpaper} that do not
+document, use @code{texi2dvi} to format your document (@pxref{Format
-require changing the source file.
+with texi2dvi}), and supply @samp{-t @@afourpaper} as an argument.  Then
+other people do not have to change the document source file to format it
-@findex afourlatex
+differently.
-You may or may not prefer the formatting that results from the command
-@code{@@afourlatex}.  There's also @code{@@afourwide} for A4 paper in
+@pindex texinfo.cnf
-wide format.
+Another alternative: put the @code{@@afourpaper} command in the file
+@file{texinfo.cnf} that @TeX{} will read.  (No need for @code{@@iftex}
+there.)  This will automatically typeset all the Texinfo documents at
-@node pagesizes
+your site with that paper size in effect.
-@section @code{@@pagesizes} [@var{width}][, @var{height}]: Custom page sizes
-@findex pagesizes
-@cindex Custom page sizes
+@node Cropmarks and Magnification,  , A4 Paper, Format/Print Hardcopy
-@cindex Page sizes, customized
+@comment  node-name,  next,  previous,  up
-@cindex Text width and height
-@cindex Width of text area
-@cindex Height of text area
-@cindex Depth of text area
-You can explicitly specify the height and (optionally) width of the main
-text area on the page with the @code{@@pagesizes} command.  Write this
-on a line by itself near the beginning of the Texinfo file, before the
-title page.  The height comes first, then the width if desired,
-separated by a comma.  Examples:
-@example
-@@pagesizes 200mm,150mm  @c for b5 paper
-@end example
-@noindent and
-@example
-@@pagesizes 11.5in      @c for legal paper
-@end example
-@cindex B5 paper, printing on
-@cindex Legal paper, printing on
-This would be reasonable for printing on B5-size paper.  To emphasize,
-this command specifies the size of the @emph{text area}, not the size of
-the paper (which is 250@dmn{mm} by 177@dmn{mm} for B5, 14@dmn{in} by
-8.5@dmn{in} for legal).
-@cindex Margins on page, not controllable
-To make more elaborate changes, such as changing any of the page
-margins, you must define a new command in @file{texinfo.tex} (or
-@file{texinfo.cnf}, @pxref{Preparing for TeX,,Preparing for @TeX{}}).
-@xref{Format with texi2dvi}, and @ref{Preparing for TeX,,Preparing for
-@TeX{}}, for other ways to specify @code{@@pagesizes} that do not
-require changing the source file.
-@code{@@pagesizes} is ignored by @code{makeinfo}.
-@node Cropmarks and Magnification
 @section Cropmarks and Magnification
 @findex cropmarks
 @cindex Cropmarks for printing
 @cindex Printing cropmarks
-You can (attempt to) direct @TeX{} to print cropmarks at the corners of
+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:@refill
 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
+spirit of adventure.  You may have to redefine the command in the
-@file{texinfo.tex}.
+@file{texinfo.tex} definitions file.@refill
 @findex mag @r{(@TeX{} command)}
 @cindex Magnified printing
 @cindex Larger or smaller pages
 You can attempt to direct @TeX{} to typeset pages larger or smaller than
 (@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
 at 1.2 normal size, write the following near the beginning of the
-Texinfo file, before the title page:
+Texinfo file, before the title page:@refill
 @example
 @group
 @@tex
 \mag=1200
 @@end tex
 @end group
 @end example
 With some printing technologies, you can print normal-sized copies that
-look better than usual by giving a larger-than-normal master to your
+look better than usual by using a larger-than-normal master.@refill
-print shop.  They do the reduction, thus effectively increasing the
-resolution.
+Depending on your system, @code{\mag} may not work or may work only at
+certain magnifications.  Be prepared to experiment.@refill
-Depending on your system, DVI files prepared with a
-nonstandard-@code{\mag} may not print or may print only with certain
+@node Create an Info File, Install an Info File, Format/Print Hardcopy, Top
-magnifications.  Be prepared to experiment.
+@comment  node-name,  next,  previous,  up
+@chapter Creating an Info File
-@node PDF Output
-@section PDF Output
-@cindex PDF output
-@pindex pdftex
-You can generate a PDF output file from Texinfo source by using the
-@command{pdftex} program to process your file instead of plain
-@command{tex}.  Just run @samp{pdftex foo.texi} instead of @samp{tex
-foo.texi}, or give the @samp{--pdf} option to @command{texi2dvi}.
-PDF stands for Portable Document Format, and was invented by Adobe
-Systems.  The
-@uref{http://www.adobe.com/prodindex/acrobat/adobepdf.html, file format
-definition} is freely available, as is a
-@uref{http://www.foolabs.com/xpdf/, free viewer} for the X window
-system.  Since PDF is a binary format, there is no @samp{@@ifpdf} or
-@samp{@@pdf} command by analogy with the other output formats.
-Despite the `portable' in the name, PDF files are nowhere near as
-portable in practice as the plain ASCII formats (Info, HTML) Texinfo
-also supports (portability relative to DVI is arguable).  They also tend
-to be much larger and do not support the bitmap fonts used by @TeX{} (by
-default) very well.  Nevertheless, a PDF file does preserve an actual
-printed document on a screen as faithfully as possible, unlike HTML,
-say, so have their place.
-PDF support in Texinfo is fairly rudimentary.
-@node Creating and Installing Info Files
-@chapter Creating and Installing Info Files
-This chapter describes how to create and install info files.  @xref{Info
-Files}, for general information about the file format itself.
-@menu
-* Creating an Info File::
-* Install an Info File::
-@end menu
-@node Creating an Info File
-@section Creating an Info File
 @cindex Creating an Info file
-@cindex Info, creating an online file
+@cindex Info, creating an on-line file
 @cindex Formatting a file for Info
-@code{makeinfo} is a program that converts a Texinfo file into an Info
+@code{makeinfo} is a utility that converts a Texinfo file into an Info
-file, HTML file, or plain text.  @code{texinfo-format-region} and
+file; @code{texinfo-format-region} and @code{texinfo-format-buffer} are
-@code{texinfo-format-buffer} are GNU Emacs functions that convert
+GNU Emacs functions that do the same.@refill
-Texinfo to Info.
+A Texinfo file must contain an @code{@@setfilename} line near its
-For information on installing the Info file in the Info system,
+beginning, otherwise the Info formatting commands will fail.
-@pxref{Install an Info File}.
+For information on installing the Info file in the Info system, see
+@ref{Install an Info File}.@refill
 @menu
 * makeinfo advantages::         @code{makeinfo} provides better error checking.
 * Invoking makeinfo::           How to run @code{makeinfo} from a shell.
 * makeinfo options::            Specify fill-column and other options.
 in Emacs Lisp are an alternative
 to @code{makeinfo}.
 * Batch Formatting::            How to format for Info in Emacs Batch mode.
 * Tag and Split Files::         How tagged and split files help Info
 to run better.
-* makeinfo html::               Generating HTML output.
 @end menu
+@node makeinfo advantages, Invoking makeinfo, Create an Info File, Create an Info File
-@node makeinfo advantages
+@ifinfo
-@subsection @code{makeinfo} Preferred
+@heading @code{makeinfo} Preferred
+@end ifinfo
 The @code{makeinfo} utility creates an Info file from a Texinfo source
 file more quickly than either of the Emacs formatting commands and
 provides better error messages.  We recommend it.  @code{makeinfo} is a
 C program that is independent of Emacs.  You do not need to run Emacs to
 use @code{makeinfo}, which means you can use @code{makeinfo} on machines
-that are too small to run Emacs.  You can run @code{makeinfo} in any one
+that are too small to run Emacs. You can run @code{makeinfo} in
-of three ways: from an operating system shell, from a shell inside
+any one of three ways: from an operating system shell, from a shell
-Emacs, or by typing the @kbd{C-c C-m C-r} or the @kbd{C-c C-m C-b}
+inside Emacs, or by typing a key command in Texinfo mode in Emacs.
-command in Texinfo mode in Emacs.
 @refill
 The @code{texinfo-format-region} and the @code{texinfo-format-buffer}
 commands are useful if you cannot run @code{makeinfo}.  Also, in some
 circumstances, they format short regions or buffers more quickly than
 @code{makeinfo}.@refill
-@node Invoking makeinfo
+@node Invoking makeinfo, makeinfo options, makeinfo advantages, Create an Info File
-@subsection Running @code{makeinfo} from a Shell
+@section Running @code{makeinfo} from a Shell
 To create an Info file from a Texinfo file, type @code{makeinfo}
 followed by the name of the Texinfo file.  Thus, to create the Info
 file for Bison, type the following to the shell:
+is the prompt):@refill
 @example
 makeinfo bison.texinfo
 @end example
 @xref{makeinfo options}, for more information.
 @end ifinfo
-@node makeinfo options
+@node makeinfo options, Pointer Validation, Invoking makeinfo, Create an Info File
 @comment  node-name,  next,  previous,  up
-@subsection Options for @code{makeinfo}
+@section Options for @code{makeinfo}
 @cindex @code{makeinfo} options
 @cindex Options for @code{makeinfo}
 The @code{makeinfo} command takes a number of options.  Most often,
 options are used to set the value of the fill column and specify the
 @item -D @var{var}
 @opindex -D @var{var}
 Cause the variable @var{var} to be defined.  This is equivalent to
 @code{@@set @var{var}} in the Texinfo file (@pxref{set clear value}).
-@item --commands-in-node-names
-@opindex --commands-in-node-names
-Allow @code{@@}-commands in node names.  This is not recommended, as it
-can probably never be implemented in @TeX{}.  It also makes
-@code{makeinfo} much slower.  Also, this option is ignored when
-@samp{--no-validate} is used.  @xref{Pointer Validation}, for more
-details.
 @item --error-limit=@var{limit}
-@itemx -e @var{limit}
 @opindex --error-limit=@var{limit}
-@opindex -e @var{limit}
 Set the maximum number of errors that @code{makeinfo} will report
 before exiting (on the assumption that continuing would be useless);
 default 100.
+@need 150
 @item --fill-column=@var{width}
-@itemx -f @var{width}
 @opindex --fill-column=@var{width}
-@opindex -f @var{width}
 Specify the maximum number of columns in a line; this is the right-hand
 edge of a line.  Paragraphs that are filled will be filled to this
 width.  (Filling is the process of breaking up and connecting lines so
 that lines are the same length as or shorter than the number specified
 as the fill column.  Lines are broken between words.) The default value
-is 72.  Ignored with @samp{--html}.
+is 72.
 @item --footnote-style=@var{style}
-@itemx -s @var{style}
 @opindex --footnote-style=@var{style}
-@opindex -s @var{style}
 Set the footnote style to @var{style}, either @samp{end} for the end
 node style (the default) or @samp{separate} for the separate node style.
 The value set by this option overrides the value set in a Texinfo file
 by an @code{@@footnotestyle} command (@pxref{Footnotes}).  When the
 footnote style is @samp{separate}, @code{makeinfo} makes a new node
 containing the footnotes found in the current node.  When the footnote
 style is @samp{end}, @code{makeinfo} places the footnote references at
-the end of the current node.  Ignored with @samp{--html}.
+the end of the current node.
 @item --force
-@itemx -F
 @opindex --force
-@opindex -F
 Ordinarily, if the input file has errors, the output files are not
 created.  With this option, they are preserved.
 @item --help
-@itemx -h
 @opindex --help
-@opindex -h
 Print a usage message listing all available options, then exit successfully.
-@item --html
-Generate HTML output rather than Info.  @xref{makeinfo html}.
 @item -I @var{dir}
 @opindex -I @var{dir}
-Append @var{dir} to the directory search list for finding files that
+Add @code{dir} to the directory search list for finding files that are
-are included using the @code{@@include} command.  By default,
+included using the @code{@@include} command.  By default,
-@code{makeinfo} searches only the current directory.  If @var{dir} is
+@code{makeinfo} searches only the current directory.
-not given, the current directory @file{.} is appended.  Note that
-@var{dir} can actually be a list of several directories separated by the
-usual path separator character (@samp{:} on Unix, @samp{;} on
-MS-DOS/MS-Windows).
-@item --macro-expand=@var{file}
-@itemx -E @var{file}
-Output the Texinfo source with all the macros expanded to the named
-file.  Normally, the results of macro expansion are used internally by
-@code{makeinfo} and then discarded.  This option is used by
-@command{texi2dvi} if you are using an old version of @file{texinfo.tex}
-that does not support @code{@@macro}.
 @item --no-headers
 @opindex --no-headers
-@cindex Plain text output
+Do not include menus or node lines in the output.  This results in an
-@cindex ASCII text output
+@sc{ascii} file that you cannot read in Info since it does not contain
-@cindex Generating plain text files
+the requisite nodes or menus. It is primarily useful to extract certain
-@cindex @file{INSTALL} file, generating
+pieces of a manual into separate files to be included in a distribution,
-For Info output, do not include menus or node lines in the output and
+such as @file{INSTALL} files.
-write to standard output (unless @option{--output} is specified).  This
-results in an @sc{ascii} file that you cannot read in Info since it does
-not contain the requisite nodes or menus.  It is primarily useful to
-extract certain pieces of a manual into separate files to be included in
-a distribution, such as @file{INSTALL} files.
-@cindex Navigation links, omitting
-For HTML output, if @samp{--no-split} is also specified, do not include a
-navigation links at the top of each node.  @xref{makeinfo html}.
 @item --no-split
 @opindex --no-split
-@cindex Splitting of output files
-@cindex Output file splitting
 Suppress the splitting stage of @code{makeinfo}.  By default, large
 output files (where the size is greater than 70k bytes) are split into
-smaller subfiles.  For Info output, each one is approximately 50k bytes.
+smaller subfiles, each one approximately 50k bytes.
-For HTML output, each file contains one node (@pxref{makeinfo html}).
 @item --no-pointer-validate
 @itemx --no-validate
 @opindex --no-pointer-validate
 @opindex --no-validate
-@cindex Pointer validation, suppressing
+Suppress the pointer-validation phase of @code{makeinfo}.  Normally,
-Suppress the pointer-validation phase of @code{makeinfo}.  This can also
+after a Texinfo file is processed, some consistency checks are made to
-be done with the @code{@@novalidate} command (@pxref{Use TeX,,Use
+ensure that cross references can be resolved, etc.
-@TeX{}}).  Normally, after a Texinfo file is processed, some consistency
+@xref{Pointer Validation}.@refill
-checks are made to ensure that cross references can be resolved, etc.
-@xref{Pointer Validation}.
 @item --no-warn
 @opindex --no-warn
 Suppress warning messages (but @emph{not} error messages).  You might
 want this if the file you are creating has examples of Texinfo cross
 references within it, and the nodes that are referenced do not actually
 exist.
-@item --number-sections
-@opindex --number-sections
-Output chapter, section, and appendix numbers as in printed manuals.
 @item --no-number-footnotes
 @opindex --no-number-footnotes
 Suppress automatic footnote numbering.  By default, @code{makeinfo}
 numbers each footnote sequentially in a single node, resetting the
 @opindex --output=@var{file}
 @opindex -o @var{file}
 Specify that the output should be directed to @var{file} and not to the
 file name specified in the @code{@@setfilename} command found in the
 Texinfo source (@pxref{setfilename}).  If @var{file} is @samp{-}, output
-goes to standard output and @samp{--no-split} is implied.  For split
+goes to standard output and @samp{--no-split} is implied.
-HTML output, @var{file} is the name of the output file for the top node
-(@pxref{makeinfo html}).
 @item -P @var{dir}
 @opindex -P @var{dir}
-Prepend @var{dir} to the directory search list for @code{@@include}.
+Prepend @code{dir} to the directory search list for @code{@@include}.
-If @var{dir} is not given, the current directory @file{.} is prepended.
 See @samp{-I} for more details.
 @item --paragraph-indent=@var{indent}
-@itemx -p @var{indent}
 @opindex --paragraph-indent=@var{indent}
-@opindex -p @var{indent}
 Set the paragraph indentation style to @var{indent}.  The value set by
 this option overrides the value set in a Texinfo file by an
 @code{@@paragraphindent} command (@pxref{paragraphindent}).  The value
 of @var{indent} is interpreted as follows:
 @item @samp{0} or @samp{none}
 Delete any existing indentation.
 @item @var{num}
-Indent each paragraph by @var{num} spaces.
+Indent each paragraph by that number of spaces.
 @end table
 @item --reference-limit=@var{limit}
-@itemx -r @var{limit}
 @opindex --reference-limit=@var{limit}
-@opindex -r @var{limit}
 Set the value of the number of references to a node that
 @code{makeinfo} will make without reporting a warning.  If a node has more
 than this number of references in it, @code{makeinfo} will make the
 references but also report a warning.  The default is 1000.
 Cause @code{makeinfo} to display messages saying what it is doing.
 Normally, @code{makeinfo} only outputs messages if there are errors or
 warnings.
 @item --version
-@itemx -V
 @opindex --version
-@opindex -V
 Print the version number, then exit successfully.
 @end table
-@node Pointer Validation
+@node Pointer Validation, makeinfo in Emacs, makeinfo options, Create an Info File
-@subsection Pointer Validation
+@section Pointer Validation
 @cindex Pointer validation with @code{makeinfo}
 @cindex Validation of pointers
-If you do not suppress pointer validation with the @samp{--no-validate}
+If you do not suppress pointer-validation, @code{makeinfo} will check
-option or the @code{@@novalidate} command in the source file (@pxref{Use
+the validity of the final Info file.  Mostly, this means ensuring that
-TeX,,Use @TeX{}}), @code{makeinfo} will check the validity of the final
+nodes you have referenced really exist.  Here is a complete list of what
-Info file.  Mostly, this means ensuring that nodes you have referenced
+is checked:@refill
-really exist.  Here is a complete list of what is checked:
 @enumerate
 @item
 If a `Next', `Previous', or `Up' node reference is a reference to a
 node in the current file and is not an external reference such as to
 @file{(dir)}, then the referenced node must exist.@refill
 @item
 In every node, if the `Previous' node is different from the `Up' node,
-then the node pointed to by the `Previous' field must have a `Next'
+then the `Previous' node must also be pointed to by a `Next' node.@refill
-field which points back to this node.@refill
 @item
 Every node except the `Top' node must have an `Up' pointer.@refill
 @item
-The node referenced by an `Up' pointer must itself reference the current
+The node referenced by an `Up' pointer must contain a reference to the
-node through a menu item, unless the node referenced by `Up'
+current node in some manner other than through a `Next' reference.
-has the form `(@var{file})'.
+This includes menu entries and cross references.@refill
 @item
 If the `Next' reference of a node is not the same as the `Next' reference
 of the `Up' reference, then the node referenced by the `Next' pointer
 must have a `Previous' pointer that points back to the current node.
 This rule allows the last node in a section to point to the first node
 of the next chapter.@refill
-@item
-Every node except `Top' should be referenced by at least one other node,
-either via the `Previous' or `Next' links, or via a menu or a
-cross-reference.@refill
 @end enumerate
-@cindex @@-commands in @@node, limited support
+@node makeinfo in Emacs, texinfo-format commands, Pointer Validation, Create an Info File
-Some Texinfo documents might fail during the validation phase because
+@section Running @code{makeinfo} inside Emacs
-they use commands like @code{@@value} and @code{@@definfoenclose} in
-node definitions and cross-references inconsistently.  Consider the
-following example:
-@example
-@group
-@@set nodename Node 1
-@@node @@value@{nodename@}, Node 2, Top, Top
-This is node 1.
-@@node Node 2, , Node 1, Top
-This is node 2.
-@end group
-@end example
-@noindent
-Here, the node ``Node 1'' was referenced both verbatim and through
-@code{@@value}.
-By default, @code{makeinfo} fails such cases, because node names are not
-fully expanded until they are written to the output file.  You should
-always try to reference nodes consistently; e.g., in the above example,
-the second @code{@@node} line should have also used @code{@@value}.
-However, if, for some reason, you @emph{must} reference node names
-inconsistently, and @code{makeinfo} fails to validate the file, you can
-use the @samp{--commands-in-node-names} option to force @code{makeinfo}
-to perform the expensive expansion of all node names it finds in the
-document.  This might considerably slow down the program, though;
-twofold increase in conversion time was measured for large documents
-such as the Jargon file.
-@cindex @@value in @@node lines
-The support for @code{@@}-commands in @code{@@node} directives is not
-general enough to be freely used.  For example, if the example above
-redefined @code{nodename} somewhere in the document, @code{makeinfo}
-will fail to convert it, even if invoked with the
-@samp{--commands-in-node-names} option.
-@samp{--commands-in-node-names} has no effect if the @samp{--no-validate}
-option is given.
-@node makeinfo in Emacs
-@subsection Running @code{makeinfo} inside Emacs
 @cindex Running @code{makeinfo} in Emacs
 @cindex @code{makeinfo} inside Emacs
 @cindex Shell, running @code{makeinfo} in
 You can run @code{makeinfo} in GNU Emacs Texinfo mode by using either the
 @findex next-error
 You can parse the error messages by typing @kbd{C-x `}
 (@code{next-error}).  This causes Emacs to go to and position the
 cursor on the line in the Texinfo source that @code{makeinfo} thinks
 caused the error.  @xref{Compilation, , Running @code{make} or
-Compilers Generally, emacs, The GNU Emacs Manual}, for more
+Compilers Generally, xemacs, XEmacs User's Manual}, for more
 information about using the @code{next-error} command.@refill
 In addition, you can kill the shell in which the @code{makeinfo}
 command is running or make the shell buffer display its most recent
 output.@refill
 @table @kbd
 @item C-c C-m C-k
 @itemx M-x makeinfo-kill-job
 @findex makeinfo-kill-job
-Kill the current running @code{makeinfo} job
+Kill the current running @code{makeinfo} job created by
-(from @code{makeinfo-region} or @code{makeinfo-buffer}).@refill
+@code{makeinfo-region} or @code{makeinfo-buffer}.@refill
 @item C-c C-m C-l
 @itemx M-x makeinfo-recenter-output-buffer
 @findex makeinfo-recenter-output-buffer
 Redisplay the @code{makeinfo} shell buffer to display its most recent
 @c If you write these three cross references using xref, you see
 @c three references to the same named manual, which looks strange.
 @iftex
 For more information, see @ref{makeinfo options, , Options for
-@code{makeinfo}}, as well as ``Editing Variable Values,'' ``Examining
+@code{makeinfo}}, as well as ``Editing Variable Values,''``Examining and
-and Setting Variables,'' and ``Init File'' in @cite{The GNU Emacs
+Setting Variables,'' and ``Init File'' in the @cite{The GNU Emacs
 Manual}.
 @end iftex
 @noindent
 @ifinfo
 For more information, see@*
-@ref{Edit Options, , Editing Variable Values, emacs, The GNU Emacs Manual},@*
+@ref{Edit Options, , Editing Variable Values, xemacs, XEmacs User's Manual},@*
-@ref{Examining, , Examining and Setting Variables, emacs, The GNU Emacs Manual},@*
+@ref{Examining, , Examining and Setting Variables, xemacs, XEmacs User's Manual},@*
-@ref{Init File, , , emacs, The GNU Emacs Manual}, and@*
+@ref{Init File, , , xemacs, XEmacs User's Manual}, and@*
 @ref{makeinfo options, , Options for @code{makeinfo}}.
 @end ifinfo
-@node texinfo-format commands
+@node texinfo-format commands, Batch Formatting, makeinfo in Emacs, Create an Info File
 @comment  node-name,  next,  previous,  up
-@subsection The @code{texinfo-format@dots{}} Commands
+@section The @code{texinfo-format@dots{}} Commands
 @findex texinfo-format-region
 @findex texinfo-format-buffer
 In GNU Emacs in Texinfo mode, you can format part or all of a Texinfo
 file with the @code{texinfo-format-region} command.  This formats the
 provide you with further help in finding formatting errors.  These
 procedures are described in an appendix; see @ref{Catching Mistakes}.
 However, the @code{makeinfo} program is often faster and
 provides better error checking (@pxref{makeinfo in Emacs}).@refill
-@node Batch Formatting
+@node Batch Formatting, Tag and Split Files, texinfo-format commands, Create an Info File
 @comment  node-name,  next,  previous,  up
-@subsection Batch Formatting
+@section Batch Formatting
 @cindex Batch formatting for Info
 @cindex Info batch formatting
 You can format Texinfo files for Info using @code{batch-texinfo-format}
 and Emacs Batch mode.  You can run Emacs in Batch mode from any shell,
 including a shell inside of Emacs.  (@xref{Command Switches, , Command
-Line Switches and Arguments, emacs, The GNU Emacs Manual}.)@refill
+Line Switches and Arguments, xemacs, XEmacs User's Manual}.)@refill
 Here is a shell command to format all the files that end in
 @file{.texinfo} in the current directory:
 @example
 mode, you create a new Emacs process.  This frees your current Emacs, so
 you can continue working in it.  (When you run
 @code{texinfo-format-region} or @code{texinfo-format-buffer}, you cannot
 use that Emacs for anything else until the command finishes.)@refill
-@node Tag and Split Files
+@node Tag and Split Files,  , Batch Formatting, Create an Info File
 @comment  node-name,  next,  previous,  up
-@subsection Tag Files and Split Files
+@section Tag Files and Split Files
 @cindex Making a tag table automatically
 @cindex Tag table, making automatically
 If a Texinfo file has more than 30,000 bytes,
 @code{texinfo-format-buffer} automatically creates a tag table
 In addition, if the Texinfo file contains more than about 70,000
 bytes, @code{texinfo-format-buffer} and @code{makeinfo} split the
 large Info file into shorter @dfn{indirect} subfiles of about 50,000
 bytes each.  Big files are split into smaller files so that Emacs does
 not need to make a large buffer to hold the whole of a large Info
-file; instead, Emacs allocates just enough memory for the small, split-off
+file; instead, Emacs allocates just enough memory for the small, split
-file that is needed at the time.  This way, Emacs avoids wasting
+off file that is needed at the time.  This way, Emacs avoids wasting
 memory when you run Info.  (Before splitting was implemented, Info
 files were always kept short and @dfn{include files} were designed as
 a way to create a single, large printed manual out of the smaller Info
 files.  @xref{Include Files}, for more information.  Include files are
-still used for very large documents, such as @cite{The Emacs Lisp
+still used for very large documents, such as @cite{The XEmacs Lisp
 Reference Manual}, in which each chapter is a separate file.)@refill
 When a file is split, Info itself makes use of a shortened version of
 the original file that contains just the tag table and references to
-the files that were split off.  The split-off files are called
+the files that were split off.  The split off files are called
 @dfn{indirect} files.@refill
-The split-off files have names that are created by appending @w{@samp{-1}},
+The split off files have names that are created by appending @w{@samp{-1}},
 @w{@samp{-2}}, @w{@samp{-3}} and so on to the file name specified by the
 @code{@@setfilename} command.  The shortened version of the original file
 continues to have the name specified by @code{@@setfilename}.@refill
 At one stage in writing this document, for example, the Info file was saved
-as the file @file{test-texinfo} and that file looked like this:@refill
+as @file{test-texinfo} and that file looked like this:@refill
 @example
 @group
 Info file: test-texinfo,    -*-Text-*-
 produced by texinfo-format-buffer
 @end group
 @end example
 @noindent
 (But @file{test-texinfo} had far more nodes than are shown here.)  Each of
-the split-off, indirect files, @file{test-texinfo-1},
+the split off, indirect files, @file{test-texinfo-1},
 @file{test-texinfo-2}, and @file{test-texinfo-3}, is listed in this file
 after the line that says @samp{Indirect:}.  The tag table is listed after
 the line that says @samp{Tag table:}. @refill
 In the list of indirect files, the number following the file name
 records the cumulative number of bytes in the preceding indirect files,
 not counting the file list itself, the tag table, or the permissions
 text in each file.  In the tag table, the number following the node name
 records the location of the beginning of the node, in bytes from the
-beginning of the (unsplit) output.
+beginning.@refill
 If you are using @code{texinfo-format-buffer} to create Info files,
 you may want to run the @code{Info-validate} command.  (The
 @code{makeinfo} command does such a good job on its own, you do not
 need @code{Info-validate}.)  However, you cannot run the @kbd{M-x
 information on how to prevent files from being split and how to
 validate the structure of the nodes, see @ref{Using
 Info-validate}.@refill
-@node makeinfo html
+@node Install an Info File, Command List, Create an Info File, Top
-@subsection Generating HTML
+@comment  node-name,  next,  previous,  up
-@cindex HTML
+@chapter Installing an Info File
-As an alternative to the normal Info format output you can use the
-@samp{--html} option to generate output in HTML format, for installation
-on a web site (for example).  In this release, HTML output from
-@code{makeinfo} is monolithic, splitting the output by chapter or node
-is not supported.  We hope to implement this feature soon.
-The HTML output file is named according to @code{@@setfilename}, but
-with any @samp{.info} extension replaced with @samp{.html}.
-Texinfo input marked up with the @code{@@ifhtml} command will produce
-output only with the @samp{--html} option supplied.  Input marked up
-with the @code{@@html} is passed literally to the output (suppressing
-the normal escaping of input @samp{<}, @samp{>} and @samp{&} characters
-which have special significance in HTML).
-The @samp{--footnote-style} option is currently ignored for HTML output;
-footnotes are hyperlinked at the end of the output file.
-The HTML generated is mostly standard (i.e., HTML 2.0, RFC1866).  The
-exception is that HTML 3.2 tables are generated from the
-@code{@@multitable} command, but tagged to degrade as well as possible
-in browsers without table support.  Please report output from an
-error-free run of @code{makeinfo} which violates the HTML 3.2 DTD as a
-bug.
-Navigation bars are inserted at the start of nodes, similarly to Info
-output.  The @samp{--no-headers} option will suppress this if used with
-@samp{--no-split}.  Header @code{<link>} elements in split output can
-support info-like navigation with browsers like Lynx and @w{Emacs W3}
-which implement this @w{HTML 1.0} feature.  You still won't normally get
-the multi-file regexp and index search facilities provided by Info
-readers.  Otherwise, hyperlinks are generated from Texinfo commands
-where appropriate.  @samp{@@xref} commands to other documents are
-generated assuming the other document is available in HTML form too, and
-@samp{.html} is appended to the @samp{@@xref} Info file name.  This
-presumably will often not work.
-@node Install an Info File
-@section Installing an Info File
 @cindex Installing an Info file
 @cindex Info file installation
 @cindex @file{dir} directory for Info installation
 Info files are usually kept in the @file{info} directory.  You can read
 Info files using the standalone Info program or the Info reader built
 into Emacs.  (@inforef{Top, info, info}, for an introduction to Info.)
 @menu
-* Directory File::              The top level menu for all Info files.
+* Directory file::              The top level menu for all Info files.
 * New Info File::               Listing a new info file.
 * Other Info Directories::      How to specify Info files that are
 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.
 @end menu
+@node Directory file, New Info File, Install an Info File, Install an Info File
-@node Directory File
+@ifinfo
-@subsection The Directory File @file{dir}
+@heading The @file{dir} File
+@end ifinfo
 For Info to work, the @file{info} directory must contain a file that
 serves as a top level directory for the Info system.  By convention,
 this file is called @file{dir}.  (You can find the location of this file
 within Emacs by typing @kbd{C-h i} to enter Info and then typing
 this:@refill
 @example
 @group
 * Menu:
 * Info:    (info).     Documentation browsing system.
 * Emacs:   (emacs).    The extensible, self-documenting
 text editor.
 * Texinfo: (texinfo).  With one source file, make
 either a printed manual using
 @example
 File: emacs  Node: Top, Up: (DIR), Next: Distrib
 @end example
 @noindent
-In this case, the @file{dir} file name is written in upper case
+(Note that in this case, the @file{dir} file name is written in upper
-letters---it can be written in either upper or lower case.  This is not
+case letters---it can be written in either upper or lower case.  Info
-true in general, it is a special case for @file{dir}.
+has a feature that it will change the case of the file name to lower
+case if it cannot find the name as written.)@refill
+@c !!! Can any file name be written in upper or lower case,
-@node New Info File
+@c     or is dir a special case?
-@subsection Listing a New Info File
+@c     Yes, apparently so, at least with Gillespie's Info.  --rjc 24mar92
+@node New Info File, Other Info Directories, Directory file, Install an Info File
+@section Listing a New Info File
 @cindex Adding a new info file
 @cindex Listing a new info file
 @cindex New info file, listing it in @file{dir} file
-@cindex Info file, listing a new
+@cindex Info file, listing new one
 @cindex @file{dir} file listing
 To add a new Info file to your system, you must write a menu entry to
 add to the menu in the @file{dir} file in the @file{info} directory.
 For example, if you were adding documentation for GDB, you would write
 followed by a period.  The third part is the description.
 The name of an Info file often has a @file{.info} extension.  Thus, the
 Info file for GDB might be called either @file{gdb} or @file{gdb.info}.
 The Info reader programs automatically try the file name both with and
-without @file{.info}@footnote{On MS-DOS/MS-Windows systems, Info will
+without @file{.info}; so it is better to avoid clutter and not to write
-try the @file{.inf} extension as well.}; so it is better to avoid
+@samp{.info} explicitly in the menu entry.  For example, the GDB menu
-clutter and not to write @samp{.info} explicitly in the menu entry.  For
+entry should use just @samp{gdb} for the file name, not @samp{gdb.info}.
-example, the GDB menu entry should use just @samp{gdb} for the file
-name, not @samp{gdb.info}.
+@node Other Info Directories, Installing Dir Entries, New Info File, Install an Info File
+@comment  node-name,  next,  previous,  up
-@node Other Info Directories
+@section Info Files in Other Directories
-@subsection Info Files in Other Directories
 @cindex Installing Info in another directory
 @cindex Info installed in another directory
 @cindex Another Info directory
-@cindex @file{dir} files and Info directories
 If an Info file is not in the @file{info} directory, there are three
 ways to specify its location:@refill
-@enumerate
+@itemize @bullet
 @item
-Write the pathname in the @file{dir} file as the second part of the menu.
+Write the pathname in the @file{dir} file as the second part of the
+menu.@refill
 @item
 If you are using Emacs, list the name of the file in a second @file{dir}
 file, in its directory; and then add the name of that directory to the
 @code{Info-directory-list} variable in your personal or site
 initialization file.
-This variable tells Emacs where to look for @file{dir} files (the files
+This tells Emacs where to look for @file{dir} files.  Emacs merges the
-must be named @file{dir}).  Emacs merges the files named @file{dir} from
+files named @file{dir} from each of the listed directories.  (In Emacs
-each of the listed directories.  (In Emacs version 18, you can set the
+version 18, you can set the @code{Info-directory} variable to the name
-@code{Info-directory} variable to the name of only one
+of only one directory.)@refill
-directory.)@refill
 @item
 Specify the Info directory name in the @code{INFOPATH} environment
 variable in your @file{.profile} or @file{.cshrc} initialization file.
 (Only you and others who set this environment variable will be able to
-find Info files whose location is specified this way.)
+find Info files whose location is specified this way.)@refill
-@end enumerate
+@end itemize
-For example, to reach a test file in the @file{/home/bob/info}
+For example, to reach a test file in the @file{/home/bob/manuals}
 directory, you could add an entry like this to the menu in the
-standard @file{dir} file:@refill
+@file{dir} file:@refill
 @example
-* Test: (/home/bob/info/info-test).  Bob's own test file.
+* Test: (/home/bob/manuals/info-test).  Bob's own test file.
 @end example
 @noindent
 In this case, the absolute file name of the @file{info-test} file is
 written as the second part of the menu entry.@refill
+@vindex Info-directory-list
 Alternatively, you could write the following in your @file{.emacs}
 file:@refill
-@vindex Info-directory-list
+@example
-@example
+@group
-@group
-(require 'info)
 (setq Info-directory-list
-(cons (expand-file-name "/home/bob/info") Info-directory-list))
+'("/home/bob/manuals"
-@end group
+"/usr/local/info"))
-@end example
+@end group
+@end example
+@c reworded to avoid overfill hbox
 This tells Emacs to merge the @file{dir} file from the
-@file{/home/bob/info} directory with the system @file{dir} file.  Info
+@file{/home/bob/manuals} directory with the @file{dir} file from the
-will list the @file{/home/bob/info/info-test} file as a menu entry in
+@file{/usr/local/info} directory.  Info will list the
-the @file{/home/bob/info/dir} file.  Emacs does the merging only
+@file{/home/bob/manuals/info-test} file as a menu entry in the
-when @kbd{M-x info} is first run, so if you want to set
+@file{/home/bob/manuals/dir} file.@refill
-@code{Info-directory-list} in an Emacs session where you've already run
-@code{info}, you must @code{(setq Info-dir-contents nil)} to force Emacs
-to recompose the @file{dir} file.
 @vindex INFOPATH
 Finally, you can tell Info where to look by setting the @code{INFOPATH}
-environment variable in your shell startup file, such as @file{.cshrc},
+environment variable in your @file{.cshrc} or @file{.profile} file.  If
-@file{.profile} or @file{autoexec.bat}.  If you use a Bourne-compatible
+you use a Bourne-compatible shell such as @code{sh} or @code{bash} for
-shell such as @code{sh} or @code{bash} for your shell command
+your shell command interpreter, you set the @code{INFOPATH} environment
-interpreter, you set the @code{INFOPATH} environment variable in the
+variable in the @file{.profile} initialization file; but if you use
-@file{.profile} initialization file; but if you use @code{csh} or
+@code{csh} or @code{tcsh}, you must set the variable in the
-@code{tcsh}, you set the variable in the @file{.cshrc} initialization
+@file{.cshrc} initialization file.  The two types of shells use
-file.  On MS-DOS/MS-Windows systems, you must set @code{INFOPATH} in
+different syntax.
-your @file{autoexec.bat} file or in the Registry.  Each type of shell
-uses a different syntax.
 @itemize @bullet
 @item
 In a @file{.cshrc} file, you could set the @code{INFOPATH}
 variable as follows:@refill
 @smallexample
-setenv INFOPATH .:~/info:/usr/local/emacs/info
+setenv INFOPATH .:~/manuals:/usr/local/emacs/info
 @end smallexample
 @item
 In a @file{.profile} file, you would achieve the same effect by
 writing:@refill
 @smallexample
-INFOPATH=.:$HOME/info:/usr/local/emacs/info
+INFOPATH=.:$HOME/manuals:/usr/local/emacs/info
 export INFOPATH
 @end smallexample
-@item
-@pindex autoexec.bat
-In a @file{autoexec.bat} file, you write this command@footnote{Note the
-use of @samp{;} as the directory separator, and a different syntax for
-using values of other environment variables.}:
-@smallexample
-set INFOPATH=.;%HOME%/info;c:/usr/local/emacs/info
-@end smallexample
 @end itemize
 @noindent
 The @samp{.} indicates the current directory as usual.  Emacs uses the
 @code{INFOPATH} environment variable to initialize the value of Emacs's
-own @code{Info-directory-list} variable.  The stand-alone Info reader
+own @code{Info-directory-list} variable.
-merges any files named @file{dir} in any directory listed in the
-@env{INFOPATH} variable into a single menu presented to you in the node
+@cindex colon @r{last in @code{INFOPATH}}
-called @samp{(dir)Top}.
+However you set @code{INFOPATH}, if its last character is a colon, this
-@cindex @samp{:} @r{last in @env{INFOPATH}}
-However you set @env{INFOPATH}, if its last character is a
-colon@footnote{On MS-DOS/MS-Windows systems, use semi-colon instead.}, this
 is replaced by the default (compiled-in) path.  This gives you a way to
 augment the default path with new directories without having to list all
-the standard places.  For example (using @code{sh} syntax):
+the standard places.  For example (using @code{sh} syntax:
 @example
 INFOPATH=/local/info:
 export INFOPATH
 @end example
 @noindent
 will search @file{/local/info} first, then the standard directories.
 Leading or doubled colons are not treated specially.
-@cindex @file{dir} file, creating your own
-When you create your own @file{dir} file for use with
-@code{Info-directory-list} or @env{INFOPATH}, it's easiest to start by
-copying an existing @file{dir} file and replace all the text after the
-@samp{* Menu:} with your desired entries.  That way, the punctuation and
-special CTRL-_ characters that Info needs will be present.
 @node Installing Dir Entries, Invoking install-info, Other Info Directories, Install an Info File
-@subsection Installing Info Directory Files
+@section Installing Info Directory Files
 When you install an Info file onto your system, you can use the program
 @code{install-info} to update the Info directory file @file{dir}.
 Normally the makefile for the package runs @code{install-info}, just
 after copying the Info file into its proper installed location.
 @findex dircategory
 @findex direntry
 In order for the Info file to work with @code{install-info}, you should
-use the commands @code{@@dircategory} and
+use the commands @code{@@dircategory} and @code{@@direntry} in the
-@code{@@direntry}@dots{}@code{@@end direntry} in the Texinfo source
+Texinfo source file.  Use @code{@@direntry} to specify the menu entry to
-file.  Use @code{@@direntry} to specify the menu entries to add to the
+add to the Info directory file, and use @code{@@dircategory} to specify
-Info directory file, and use @code{@@dircategory} to specify which part
+which part of the Info directory to put it in.  Here is how these
-of the Info directory to put it in.  Here is how these commands are used
+commands are used in this manual:
-in this manual:
 @smallexample
 @@dircategory Texinfo documentation system
 @@direntry
 * Texinfo: (texinfo).           The GNU documentation format.
 the beginning of the Texinfo input, before the first @code{@@node}
 command.  If you use them later on in the input, @code{install-info}
 will not notice them.
 If you use @code{@@dircategory} more than once in the Texinfo source,
-each usage specifies the `current' category; any subsequent
+each usage specifies one category; the new menu entry is added to the
-@code{@@direntry} commands will add to that category.
+Info directory file in each of the categories you specify.  If you use
+@code{@@direntry} more than once, each usage specifies one menu entry;
-Here are some recommended @code{@@dircategory} categories: `GNU
+each of these menu entries is added to the directory in each of the
-packages', `GNU programming tools', `GNU programming documentation',
+specified categories.
-`GNU Emacs Lisp', `GNU libraries', `Linux', `TeX', `Individual
-utilities'.  The idea is to include the `invoking' node for every
-program installed by a package under `Individual utilities', and an
+@node Invoking install-info,  , Installing Dir Entries, Install an Info File
-entry for the manual as a whole in the appropriate other category.
+@section Invoking install-info
-@node Invoking install-info
-@subsection Invoking install-info
 @pindex install-info
 @code{install-info} inserts menu entries from an Info file into the
 top-level @file{dir} file in the Info system (see the previous sections
 for an explanation of how the @file{dir} file works).  It's most often
-run as part of software installation, or when constructing a @file{dir} file
+run as part of software installation, or when constructing a dir file
 for all manuals on a system.  Synopsis:
 @example
 install-info [@var{option}]@dots{} [@var{info-file} [@var{dir-file}]]
 @end example
-If @var{info-file} or @var{dir-file} are not specified, the options
+If @var{info-file} or @var{dir-file} are not specified, the various
-(described below) that define them must be.  There are no compile-time
+options (described below) that define them must be.  There are no
-defaults, and standard input is never used.  @code{install-info} can
+compile-time defaults, and standard input is never used.
-read only one Info file and write only one @file{dir} file per invocation.
+@code{install-info} can read only one info file and write only one dir
+file per invocation.
 @cindex @file{dir}, created by @code{install-info}
 If @var{dir-file} (however specified) does not exist,
 @code{install-info} creates it if possible (with no entries).
-@cindex Compressed files, reading
-@cindex Dir files, compressed
-If any input file is compressed with @code{gzip} (@pxref{Invoking
-gzip,,,gzip, Gzip}), @code{install-info} automatically uncompresses it
-for reading.  And if @var{dir-file} is compressed, @code{install-info}
-also automatically leaves it compressed after writing any changes.
-If @var{dir-file} itself does not exist, @code{install-info} tries to
-open @file{@var{dir-file}.gz}.
 Options:
 @table @code
 @item --delete
 Delete the entries in @var{info-file} from @var{dir-file}.  The file
 name in the entry in @var{dir-file} must be @var{info-file} (except for
 an optional @samp{.info} in either one).  Don't insert any new entries.
 @item --dir-file=@var{name}
-@itemx -d @var{name}
 @opindex --dir-file=@var{name}
-@opindex -d @var{name}
 Specify file name of the Info directory file.  This is equivalent to
 using the @var{dir-file} argument.
 @item --entry=@var{text}
-@itemx -e @var{text}
 @opindex --entry=@var{text}
-@opindex -e @var{text}
 Insert @var{text} as an Info directory entry; @var{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.  If you don't specify any entries, they are determined from
 information in the Info file itself.
 @item --help
-@itemx -h
 @opindex --help
-@opindex -h
 Display a usage message listing basic usage and all available options,
 then exit successfully.
 @item --info-file=@var{file}
-@itemx -i @var{file}
 @opindex --info-file=@var{file}
-@opindex -i @var{file}
 Specify Info file to install in the directory.
-Equivalent to using the @var{info-file} argument.
+This is equivalent to using the @var{info-file} argument.
 @item --info-dir=@var{dir}
-@itemx -D @var{dir}
 @opindex --info-dir=@var{dir}
-@opindex -D @var{dir}
-Specify the directory where @file{dir} resides.
 Equivalent to @samp{--dir-file=@var{dir}/dir}.
 @item --item=@var{text}
 @opindex --item=@var{text}
 Same as @samp{--entry=@var{text}}.  An Info directory entry is actually
 @item --quiet
 @opindex --quiet
 Suppress warnings.
 @item --remove
-@itemx -r
 @opindex --remove
-@opindex -r
 Same as @samp{--delete}.
 @item --section=@var{sec}
-@itemx -s @var{sec}
 @opindex --section=@var{sec}
-@opindex -s @var{sec}
 Put this file's entries in section @var{sec} of the directory.  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 from
 information in the Info file itself.
 @item --version
-@itemx -V
 @opindex --version
-@opindex -V
 @cindex version number, finding
 Display version information and exit successfully.
 @end table
-@node Command List
+@node Command List, Tips, Install an Info File, Top
 @appendix @@-Command List
 @cindex Alphabetical @@-command list
 @cindex List of  @@-commands
 @cindex @@-command list
-@cindex Reference to @@-commands
 Here is an alphabetical list of the @@-commands in Texinfo.  Square
 brackets, @t{[}@w{ }@t{]}, indicate optional arguments; an ellipsis,
-@samp{@dots{}}, indicates repeated text.
+@samp{@dots{}}, indicates repeated text.@refill
 @sp 1
 @table @code
 @item @@@var{whitespace}
 An @code{@@} followed by a space, tab, or newline produces a normal,
 @item @@:
 Indicate to @TeX{} that an immediately preceding period, question
 mark, exclamation mark, or colon does not end a sentence.  Prevent
 @TeX{} from inserting extra whitespace as it does at the end of a
 sentence.  The command has no effect on the Info file output.
-@xref{Not Ending a Sentence}.
+@xref{Not Ending a Sentence}.@refill
 @item @@=
-Generate a macron (bar) accent over the next character, as in @=o.
+Generate a macro (bar) accent over the next character, as in @=o.
 @xref{Inserting Accents}.
 @item @@?
 Generate a question mark that really does end a sentence (usually after
 an end-of-sentence capital letter).  @xref{Ending a Sentence}.
 @item @@@}
 Stands for a right-hand brace, @samp{@}}.@*
 @xref{Braces Atsigns, , Inserting @@ and braces}.
-@item @@~
+@item @@=
 Generate a tilde accent over the next character, as in @~N.
 @xref{Inserting Accents}.
 @item @@AA@{@}
 @itemx @@aa@{@}
 Generate the uppercase and lowercase Scandinavian A-ring letters,
 respectively: @AA{}, @aa{}.  @xref{Inserting Accents}.
-@item @@acronym@{@var{abbrev}@}
-Tag @var{abbrev} as an acronym, that is, an abbreviation written in all
-capital letters, such as `NASA'.  @xref{acronym,, @code{acronym}}.
 @item @@AE@{@}
 @itemx @@ae@{@}
 Generate the uppercase and lowercase AE ligatures, respectively:
 @AE{}, @ae{}.  @xref{Inserting Accents}.
-@item @@afourlatex
+@item @@afourpaper
-@itemx @@afourpaper
+Change page dimensions for the A4 paper size.
-@itemx @@afourwide
+Only allowed inside @code{@@iftex} @dots{} @code{@@end iftex}.
-Change page dimensions for the A4 paper size.  @xref{A4 Paper}.
+@xref{A4 Paper}.
-@item @@alias @var{new}=@var{existing}
-Make the command @samp{@@@var{new}} an alias for the existing command
-@samp{@@@var{existing}}.  @xref{alias}.
-@item @@anchor@{@var{name}@}
-Define @var{name} as the current location for use as a cross-reference
-target.  @xref{anchor,, @code{@@anchor}}.
 @item @@appendix @var{title}
 Begin an appendix.  The title appears in the table
 of contents of a printed manual.  In Info, the title is
 underlined with asterisks.  @xref{unnumbered & appendix, , The
 @item @@code@{@var{sample-code}@}
 Highlight text that is an expression, a syntactically complete token
 of a program, or a program name.  @xref{code, , @code{@@code}}.@refill
-@item @@command@{@var{command-name}@}
-Indicate a command name, such as @command{ls}.
-@xref{command,, @code{@@command}}.
 @item @@comment @var{comment}
 Begin a comment in Texinfo.  The rest of the line does not appear in
 either the Info file or the printed manual.  A synonym for @code{@@c}.
-@xref{Comments}.
+@xref{Comments, , Comments}.@refill
 @item @@contents
 Print a complete table of contents.  Has no effect in Info, which uses
 menus instead.  @xref{Contents, , Generating a Table of
 Contents}.@refill
 @item @@defindex @var{index-name}
 Define a new index and its indexing command.  Print entries in a roman
 font.  @xref{New Indices, , Defining New Indices}.@refill
-@item @@definfoenclose @var{newcmd}, @var{before}, @var{after},
+@c Unused so far as I can see and unsupported by makeinfo -- karl, 15sep96.
-Create new @@-command @var{newcmd} for Info that marks text by enclosing
+@item @@definfoenclose @var{new-command}, @var{before}, @var{after},
-it in strings that precede and follow the text.  @xref{definfoenclose}.
+Create new @@-command for Info that marks text by enclosing it in
+strings that precede and follow the text.  Write definition inside of
+@code{@@ifinfo} @dots{} @code{@@end ifinfo}. @xref{Customized
+Highlighting}.@refill
 @item @@defivar @var{class} @var{instance-variable-name}
 @itemx @@defivarx @var{class} @var{instance-variable-name}
 This command formats a description for an instance variable in
 object-oriented programming.  The command is equivalent to @samp{@@defcv
 @{Instance Variable@} @dots{}}.  @xref{Definition Commands}, and
 @ref{deffnx,, Def Cmds in Detail}.
-@item @@defmac @var{macroname} @var{arguments}@dots{}
+@item @@defmac @var{macro-name} @var{arguments}@dots{}
-@itemx @@defmacx @var{macroname} @var{arguments}@dots{}
+@itemx @@defmacx @var{macro-name} @var{arguments}@dots{}
 Format a description for a macro.  The command is equivalent to
 @samp{@@deffn Macro @dots{}}.  @xref{Definition Commands}, and
 @ref{deffnx,, Def Cmds in Detail}.
 @item @@defmethod @var{class} @var{method-name} @var{arguments}@dots{}
 @itemx @@defopx @var{category} @var{class} @var{name} @var{arguments}@dots{}
 Format a description for an operation in object-oriented programming.
 @code{@@defop} takes as arguments the overall name of the category of
 operation, the name of the class of the operation, the name of the
 operation, and its arguments, if any.  @xref{Definition
-Commands}, and @ref{Abstract Objects}.
+Commands}, and @ref{deffnx,, Def Cmds in Detail}.
 @item @@defopt @var{option-name}
 @itemx @@defoptx @var{option-name}
 Format a description for a user option.  The command is equivalent to
 @samp{@@defvr @{User Option@} @dots{}}.  @xref{Definition Commands}, and
 @item @@deftp @var{category} @var{name-of-type} @var{attributes}@dots{}
 @itemx @@deftpx @var{category} @var{name-of-type} @var{attributes}@dots{}
 Format a description for a data type.  @code{@@deftp} takes as arguments
 the category, the name of the type (which is a word like @samp{int} or
 @samp{float}), and then the names of attributes of objects of that type.
-@xref{Definition Commands}, and @ref{Data Types}.
+@xref{Definition Commands}, and @ref{deffnx,, Def Cmds in Detail}.
 @item @@deftypefn @var{classification} @var{data-type} @var{name} @var{arguments}@dots{}
 @itemx @@deftypefnx @var{classification} @var{data-type} @var{name} @var{arguments}@dots{}
 Format a description for a function or similar entity that may take
 arguments and that is typed.  @code{@@deftypefn} takes as arguments the
 @item @@deftypefun @var{data-type} @var{function-name} @var{arguments}@dots{}
 @itemx @@deftypefunx @var{data-type} @var{function-name} @var{arguments}@dots{}
 Format a description for a function in a typed language.
 The command is equivalent to @samp{@@deftypefn Function @dots{}}.
-@xref{Definition Commands}, and @ref{deffnx,, Def Cmds in Detail}.
+@xref{Definition Commands},
+and @ref{deffnx,, Def Cmds in Detail}.
-@item @@deftypeivar @var{class} @var{data-type} @var{variable-name}
-@itemx @@deftypeivarx @var{class} @var{data-type} @var{variable-name}
-Format a description for a typed instance variable in object-oriented
-programming. @xref{Definition Commands}, and @ref{Abstract Objects}.
 @item @@deftypemethod @var{class} @var{data-type} @var{method-name} @var{arguments}@dots{}
 @itemx @@deftypemethodx @var{class} @var{data-type} @var{method-name} @var{arguments}@dots{}
 Format a description for a typed method in object-oriented programming.
+Takes as arguments the name of the class of the method, the return type
+of the method, the name of the method, and its arguments, if any.
 @xref{Definition Commands}, and @ref{deffnx,, Def Cmds in Detail}.
-@item @@deftypeop @var{category} @var{class} @var{data-type} @var{name} @var{arguments}@dots{}
-@itemx @@deftypeopx @var{category} @var{class} @var{data-type} @var{name} @var{arguments}@dots{}
-Format a description for a typed operation in object-oriented programming.
-@xref{Definition Commands}, and @ref{Abstract Objects}.
-@item @@deftypevar @var{data-type} @var{variable-name}
-@itemx @@deftypevarx @var{data-type} @var{variable-name}
-Format a description for a variable in a typed language.  The command is
-equivalent to @samp{@@deftypevr Variable @dots{}}.  @xref{Definition
-Commands}, and @ref{deffnx,, Def Cmds in Detail}.
 @item @@deftypevr @var{classification} @var{data-type} @var{name}
 @itemx @@deftypevrx @var{classification} @var{data-type} @var{name}
 Format a description for something like a variable in a typed
 language---an entity that records a value.  Takes as arguments the
 classification of entity being described, the type, and the name of the
 entity.  @xref{Definition Commands}, and @ref{deffnx,, Def Cmds in
 Detail}.
+@item @@deftypevar @var{data-type} @var{variable-name}
+@itemx @@deftypevarx @var{data-type} @var{variable-name}
+Format a description for a variable in a typed language.  The command is
+equivalent to @samp{@@deftypevr Variable @dots{}}.  @xref{Definition
+Commands}, and @ref{deffnx,, Def Cmds in Detail}.
 @item @@defun @var{function-name} @var{arguments}@dots{}
 @itemx @@defunx @var{function-name} @var{arguments}@dots{}
 Format a description for functions.  The command is equivalent to
 @samp{@@deffn Function @dots{}}.  @xref{Definition Commands}, and
 @ref{deffnx,, Def Cmds in Detail}.
 Format a description for any kind of variable.  @code{@@defvr} takes
 as arguments the category of the entity and the name of the entity.
 @xref{Definition Commands},
 and @ref{deffnx,, Def Cmds in Detail}.
-@item @@detailmenu
+@item @@detailmenu@{@}
 Avoid @code{makeinfo} confusion stemming from the detailed node listing
 in a master menu.  @xref{Master Menu Parts}.
 @item @@dfn@{@var{term}@}
 Highlight the introductory or defining use of a term.
 @item @@dircategory @var{dirpart}
 Specify a part of the Info directory menu where this file's entry should
 go.  @xref{Installing Dir Entries}.
 @item @@direntry
-Begin the Info directory menu entry for this file.  Pair with
+Begin the Info directory menu entry for this file.
-@code{@@end direntry}.  @xref{Installing Dir Entries}.
+@xref{Installing Dir Entries}.
+@need 100
 @item @@display
-Begin a kind of example.  Like @code{@@example} (indent text, do not
+Begin a kind of example.  Indent text, do not fill, do not select a
-fill), but do not select a new font.  Pair with @code{@@end display}.
+new font.  Pair with @code{@@end display}.  @xref{display, ,
-@xref{display, , @code{@@display}}.
+@code{@@display}}.@refill
 @item @@dmn@{@var{dimension}@}
 Format a unit of measure, as in 12@dmn{pt}.  Causes @TeX{} to insert a
 thin space before @var{dimension}.  No effect in Info.
-@xref{dmn, , @code{@@dmn}}.
+@xref{dmn, , @code{@@dmn}}.@refill
-@item @@documentencoding @var{enc}
-Declare the input encoding as @var{enc}.
-@xref{documentencoding,, @code{@@documentencoding}}.
-@item @@documentlanguage @var{CC}
-Declare the document language as the two-character ISO-639 abbreviation
-@var{CC}.  @xref{documentlanguage,, @code{@@documentlanguage}}.
 @item @@dotaccent@{@var{c}@}
-Generate a dot accent over the character @var{c}, as in @dotaccent{o}.
+Generate a dot accent over the character @var{c}, as in @dotaccent{oo}.
 @xref{Inserting Accents}.
 @item @@dots@{@}
 Insert an ellipsis: @samp{@dots{}}.
-@xref{dots, , @code{@@dots}}.@refill
+@xref{dots, , @code{@@dots@{@}}}.@refill
 @item @@email@{@var{address}[, @var{displayed-text}]@}
 Indicate an electronic mail address.
-@xref{email, , @code{@@email}}.
+@xref{email, , @code{@@email}}.@refill
+@need 100
 @item @@emph@{@var{text}@}
 Highlight @var{text}; text is displayed in @emph{italics} in printed
 output, and surrounded by asterisks in Info.  @xref{Emphasis, ,
 Emphasizing Text}.
 @item @@end @var{environment}
 Ends @var{environment}, as in @samp{@@end example}.  @xref{Formatting
 Commands,,@@-commands}.
-@item @@env@{@var{environment-variable}@}
-Indicate an environment variable name, such as @env{PATH}.
-@xref{env,, @code{@@env}}.
 @item @@enddots@{@}
 Generate an end-of-sentence of ellipsis, like this @enddots{}
 @xref{dots,,@code{@@dots@{@}}}.
+@need 100
 @item @@enumerate [@var{number-or-letter}]
 Begin a numbered list, using @code{@@item} for each entry.
 Optionally, start list with @var{number-or-letter}.  Pair with
 @code{@@end enumerate}.  @xref{enumerate, ,
 @code{@@enumerate}}.@refill
+@need 100
 @item @@equiv@{@}
 Indicate to the reader the exact equivalence of two forms with a
 glyph: @samp{@equiv{}}.  @xref{Equivalence}.@refill
 @item @@error@{@}
 @item @@example
 Begin an example.  Indent text, do not fill, and select fixed-width font.
 Pair with @code{@@end example}.  @xref{example, ,
 @code{@@example}}.@refill
-@item @@exampleindent @var{indent}
-Indent example-like environments by @var{indent} number of spaces
-(perhaps 0).  @xref{exampleindent,, Paragraph Indenting}.
 @item @@exclamdown@{@}
 Produce an upside-down exclamation point.  @xref{Inserting Accents}.
 @item @@exdent @var{line-of-text}
 Remove any indentation a line might have.  @xref{exdent, ,
 @item @@finalout
 Prevent @TeX{} from printing large black warning rectangles beside
 over-wide lines.  @xref{Overfull hboxes}.@refill
+@need 100
 @item @@findex @var{entry}
 Add @var{entry} to the index of functions.  @xref{Index Entries, ,
 Defining the Entries of an Index}.@refill
+@need 200
 @item @@flushleft
 @itemx @@flushright
 Left justify every line but leave the right end ragged.
 Leave font as is.  Pair with @code{@@end flushleft}.
 @code{@@flushright} analogous.
 @xref{flushleft & flushright, , @code{@@flushleft} and
 @code{@@flushright}}.@refill
+@need 200
 @item @@footnote@{@var{text-of-footnote}@}
 Enter a footnote.  Footnote text is printed at the bottom of the page
 by @TeX{}; Info may format in either `End' node or `Separate' node style.
 @xref{Footnotes}.@refill
 Specify an Info file's footnote style, either @samp{end} for the end
 node style or @samp{separate} for the separate node style.
 @xref{Footnotes}.@refill
 @item @@format
-Begin a kind of example.  Like @code{@@display}, but do not narrow the
+Begin a kind of example.  Like @code{@@example} or @code{@@display},
-margins.  Pair with @code{@@end format}.  @xref{example,,
+but do not narrow the margins and do not select the fixed-width font.
-@code{@@example}}.
+Pair with @code{@@end format}.  @xref{example, ,
+@code{@@example}}.@refill
 @item @@ftable @var{formatting-command}
 Begin a two-column table, using @code{@@item} for each entry.
 Automatically enter each of the items in the first column into the
 index of functions.  Pair with @code{@@end ftable}.  The same as
 @c @TeX{}.  Write definition inside of @code{@@iftex} @dots{} @code{@@end
 @c iftex}.  @xref{Customized Highlighting}.@refill
 @item @@lisp
 Begin an example of Lisp code.  Indent text, do not fill, and select
-fixed-width font.  Pair with @code{@@end lisp}.  @xref{lisp, , @code{@@lisp}}.
+fixed-width font.  Pair with @code{@@end lisp}.  @xref{Lisp Example, ,
+@code{@@lisp}}.@refill
 @item @@lowersections
 Change subsequent chapters to sections, sections to subsections, and so
 on. @xref{Raise/lower sections, , @code{@@raisesections} and
 @code{@@lowersections}}.@refill
-@item @@macro @var{macroname} @{@var{params}@}
+@item @@macro @var{macro-name} @{@var{params}@}
-Define a new Texinfo command @code{@@@var{macroname}@{@var{params}@}}.
+Define a new Texinfo command @code{@@@var{macro-name}@{@var{params}@}}.
 Only supported by @code{makeinfo} and @code{texi2dvi}.  @xref{Defining
 Macros}.
 @item @@majorheading @var{title}
 Print a chapter-like heading in the text, but not in the table of
 heading line is underlined with asterisks.  @xref{majorheading &
 chapheading, , @code{@@majorheading} and @code{@@chapheading}}.@refill
 @item @@math@{@var{mathematical-expression}@}
 Format a mathematical expression.
-@xref{math, , @code{@@math}: Inserting Mathematical Expressions}.
+@xref{math, , @code{@@math} - Inserting Mathematical Expressions}.
 @item @@menu
 Mark the beginning of a menu of nodes in Info.  No effect in a printed
 manual.  Pair with @code{@@end menu}.  @xref{Menus}.@refill
 references for @TeX{}.  @xref{node, , @code{@@node}}.@refill
 @item @@noindent
 Prevent text from being indented as if it were a new paragraph.
 @xref{noindent, , @code{@@noindent}}.@refill
-@item @@novalidate
-Suppress validation of node references, omit creation of auxiliary files
-with @TeX{}.  Use before @code{@@setfilename}.  @xref{Pointer Validation}.
 @item @@O@{@}
 @itemx @@o@{@}
 Generate the uppercase and lowercase O-with-slash letters, respectively:
 @O{}, @o{}.
 @item @@OE@{@}
 @itemx @@oe@{@}
 Generate the uppercase and lowercase OE ligatures, respectively:
 @OE{}, @oe{}.  @xref{Inserting Accents}.
-@item @@option@{@var{option-name}@}
-Indicate a command-line option, such as @option{-l} or @option{--help}.
-@xref{option,, @code{@@option}}.
 @item @@page
 Start a new page in a printed manual.  No effect in Info.
 @xref{page, , @code{@@page}}.@refill
-@item @@pagesizes [@var{width}][, @var{height}]
-Change page dimensions.  @xref{pagesizes}.
 @item @@paragraphindent @var{indent}
-Indent paragraphs by @var{indent} number of spaces (perhaps 0); preserve
+Indent paragraphs by @var{indent} number of spaces; delete indentation
-source file indentation if @var{indent} is @code{asis}.
+if the value of @var{indent} is 0; and do not change indentation if
-@xref{paragraphindent,, Paragraph Indenting}.
+@var{indent} is @code{asis}. @xref{paragraphindent, , Paragraph
+Indenting}.@refill
 @item @@pindex @var{entry}
 Add @var{entry} to the index of programs.  @xref{Index Entries, , Defining
 the Entries of an Index}.@refill
 Narrow the margins to indicate text that is quoted from another real
 or imaginary work.  Write command on a line of its own.  Pair with
 @code{@@end quotation}.  @xref{quotation, ,
 @code{@@quotation}}.@refill
+@need 100
 @item @@r@{@var{text}@}
 Print @var{text} in @r{roman} font.  No effect in Info.
 @xref{Fonts}.@refill
 @item @@raisesections
 Change subsequent sections to chapters, subsections to sections, and so
 on.  @xref{Raise/lower sections, , @code{@@raisesections} and
 @code{@@lowersections}}.@refill
+@need 300
 @item @@ref@{@var{node-name}, [@var{entry}], [@var{topic-or-title}], [@var{info-file}], [@var{manual}]@}
 Make a reference.  In a printed manual, the reference does not start
 with a `See'.  Follow command with a punctuation mark.  Only the first
 argument is mandatory.  @xref{ref, , @code{@@ref}}.@refill
+@need 300
 @item @@refill
 In Info, refill and indent the paragraph after all the other processing
 has been done.  No effect on @TeX{}, which always refills.  This command
 is no longer needed, since all formatters now automatically refill.
 @xref{Refilling Paragraphs}.@refill
+@need 300
 @item @@result@{@}
 Indicate the result of an expression to the reader with a special
 glyph: @samp{@result{}}.  @xref{result, , @code{@@result}}.@refill
 @item @@ringaccent@{@var{c}@}
 @item @@set @var{flag} [@var{string}]
 Make @var{flag} active, causing the Texinfo formatting commands to
 format text between subsequent pairs of @code{@@ifset @var{flag}} and
 @code{@@end ifset} commands.  Optionally, set value of @var{flag} to
 @var{string}.
-@xref{set clear value, , @code{@@set} @code{@@clear} @code{@@value}}.
+@xref{set clear value, , @code{@@set} @code{@@clear} @code{@@value}}.@refill
 @item @@setchapternewpage @var{on-off-odd}
 Specify whether chapters start on new pages, and if so, whether on
 odd-numbered (right-hand) new pages.  @xref{setchapternewpage, ,
-@code{@@setchapternewpage}}.
+@code{@@setchapternewpage}}.@refill
-@item @@setcontentsaftertitlepage
-Put the table of contents after the @samp{@@end titlepage} even if the
-@code{@@contents} command is not there.  @xref{Contents}.
 @item @@setfilename @var{info-file-name}
 Provide a name to be used by the Info file.  This command is essential
 for @TeX{} formatting as well, even though it produces no output.
-@xref{setfilename, , @code{@@setfilename}}.
+@xref{setfilename, , @code{@@setfilename}}.@refill
-@item @@setshortcontentsaftertitlepage
-Place the short table of contents after the @samp{@@end titlepage}
-command even if the @code{@@shortcontents} command is not there.
-@xref{Contents}.
 @item @@settitle @var{title}
 Provide a title for page headers in a printed manual.
 @xref{settitle, , @code{@@settitle}}.@refill
 Print a short table of contents.  Not relevant to Info, which uses
 menus rather than tables of contents.  A synonym for
 @code{@@summarycontents}.  @xref{Contents, , Generating a Table of
 Contents}.@refill
-@item @@shorttitlepage @var{title}
+@item @@shorttitlepage@{@var{title}@}
 Generate a minimal title page.  @xref{titlepage,,@code{@@titlepage}}.
+@need 400
 @item @@smallbook
 Cause @TeX{} to produce a printed manual in a 7 by 9.25 inch format
 rather than the regular 8.5 by 11 inch format.  @xref{smallbook, ,
-Printing Small Books}.  Also, see @ref{small}.
+Printing Small Books}.  Also, see @ref{smallexample & smalllisp, ,
+@code{@@smallexample} and @code{@@smalllisp}}.@refill
-@item @@smalldisplay
-Begin a kind of example.  Like @code{@@smallexample} (indent text, no
+@need 400
-filling), but do not select the fixed-width font.  In @code{@@smallbook}
-format, print text in a smaller font than with @code{@@display}.  Pair
-with @code{@@end smalldisplay}.  @xref{small}.
 @item @@smallexample
 Indent text to indicate an example.  Do not fill, select fixed-width
 font.  In @code{@@smallbook} format, print text in a smaller font than
 with @code{@@example}.  Pair with @code{@@end smallexample}.
-@xref{small}.
+@xref{smallexample & smalllisp, , @code{@@smallexample} and
+@code{@@smalllisp}}.@refill
-@item @@smallformat
-Begin a kind of example.  Like @code{@@smalldisplay}, but do not narrow
+@need 400
-the margins and do not select the fixed-width font.
-In @code{@@smallbook} format, print text in a smaller font than
-with @code{@@format}.  Pair with @code{@@end smallformat}.
-@xref{small}.
 @item @@smalllisp
 Begin an example of Lisp code.  Indent text, do not fill, select
 fixed-width font.  In @code{@@smallbook} format, print text in a
-smaller font.  Pair with @code{@@end smalllisp}.  @xref{small}.
+smaller font.  Pair with @code{@@end smalllisp}.  @xref{smallexample &
+smalllisp, , @code{@@smallexample} and @code{@@smalllisp}}.@refill
+@need 700
 @item @@sp @var{n}
 Skip @var{n} blank lines.  @xref{sp, , @code{@@sp}}.@refill
 @item @@ss@{@}
 Generate the German sharp-S es-zet letter, @ss{}.  @xref{Inserting Accents}.
-@item @@strong @{@var{text}@}
+@need 700
+@item @@strong @var{text}
 Emphasize @var{text} by typesetting it in a @strong{bold} font for the
 printed manual and by surrounding it with asterisks for Info.
 @xref{emph & strong, , Emphasizing Text}.@refill
 @item @@subheading @var{title}
 Print a short table of contents.  Not relevant to Info, which uses
 menus rather than tables of contents.  A synonym for
 @code{@@shortcontents}.  @xref{Contents, , Generating a Table of
 Contents}.@refill
+@need 300
 @item @@syncodeindex @var{from-index} @var{into-index}
 Merge the index named in the first argument into the index named in
 the second argument, printing the entries from the first index in
 @code{@@code} font.  @xref{Combining Indices}.@refill
+@need 300
 @item @@synindex @var{from-index} @var{into-index}
 Merge the index named in the first argument into the index named in
 the second argument.  Do not change the font of @var{from-index}
 entries.  @xref{Combining Indices}.@refill
+@need 100
 @item @@t@{@var{text}@}
 Print @var{text} in a @t{fixed-width}, typewriter-like font.
 No effect in Info.  @xref{Fonts}.@refill
 @item @@tab
 Separate columns in a multitable.  @xref{Multitable Rows}.
+@need 400
 @item @@table @var{formatting-command}
 Begin a two-column table, using @code{@@item} for each entry.  Write
 each first column entry on the same line as @code{@@item}.  First
 column entries are printed in the font resulting from
 @var{formatting-command}.  Pair with @code{@@end table}.
 page in a larger than normal font and underline it with a black rule.
 Not relevant to Info, which does not have title pages.  @xref{title
 subtitle author, , The @code{@@title} @code{@@subtitle} and
 @code{@@author} Commands}.@refill
+@need 400
 @item @@titlefont@{@var{text}@}
 In a printed manual, print @var{text} in a larger than normal font.
 Not relevant to Info, which does not have title pages.
 @xref{titlefont center sp, , The @code{@@titlefont} @code{@@center}
 and @code{@@sp} Commands}.@refill
+@need 300
 @item @@titlepage
 Indicate to Texinfo the beginning of the title page.  Write command on
 a line of its own.  Pair with @code{@@end titlepage}.  Nothing between
 @code{@@titlepage} and @code{@@end titlepage} appears in Info.
 @xref{titlepage, , @code{@@titlepage}}.@refill
+@need 150
 @item @@today@{@}
 Insert the current date, in `1 Jan 1900' style.  @xref{Custom
 Headings, , How to Make Your Own Headings}.@refill
 @item @@top @var{title}
 In a printed manual, begin an unnumbered subsubsection within a
 chapter.  The title appears in the table of contents of a printed
 manual.  In Info, the title is underlined with periods.
 @xref{subsubsection, , The `subsub' Commands}.@refill
-@item @@uref@{@var{url}[, @var{displayed-text}][, @var{replacement}@}
+@item @@uref@{@var{url}[, @var{displayed-text}@}
 Define a cross reference to an external uniform resource locator for the
-World Wide Web.  @xref{uref, , @code{@@uref}}.@refill
+World Wide Web.  @xref{url, , @code{@@url}}.@refill
 @item @@url@{@var{url}@}
 Indicate text that is a uniform resource locator for the World Wide
 Web.  @xref{url, , @code{@@url}}.@refill
 @item @@var@{@var{metasyntactic-variable}@}
 Highlight a metasyntactic variable, which is something that stands for
 another piece of text.  @xref{var, , Indicating Metasyntactic
 Variables}.@refill
+@need 400
 @item @@vindex @var{entry}
 Add @var{entry} to the index of variables.  @xref{Index Entries, ,
 Defining the Entries of an Index}.@refill
+@need 400
 @item @@vskip @var{amount}
 In a printed manual, insert whitespace so as to push text on the
 remainder of the page towards the bottom of the page.  Used in
 formatting the copyright page with the argument @samp{0pt plus
 1filll}.  (Note spelling of @samp{filll}.)  @code{@@vskip} may be used
 only in contexts ignored for Info.  @xref{Copyright & Permissions, ,
 The Copyright Page and Printed Permissions}.@refill
+@need 400
 @item @@vtable @var{formatting-command}
 Begin a two-column table, using @code{@@item} for each entry.
 Automatically enter each of the items in the first column into the
 index of variables.  Pair with @code{@@end vtable}.  The same as
 @code{@@table}, except for indexing.  @xref{ftable vtable, ,
 @code{@@ftable} and @code{@@vtable}}.@refill
+@need 400
 @item @@w@{@var{text}@}
 Prevent @var{text} from being split across two lines.  Do not end a
 paragraph that uses @code{@@w} with an @code{@@refill} command.
 @xref{w, , @code{@@w}}.@refill
+@need 400
 @item @@xref@{@var{node-name}, [@var{entry}], [@var{topic-or-title}], [@var{info-file}], [@var{manual}]@}
 Make a reference that starts with `See' in a printed manual.  Follow
 command with a punctuation mark.  Only the first argument is
 mandatory.  @xref{xref, , @code{@@xref}}.@refill
 @end table
-@node Tips
+@node Tips, Sample Texinfo File, Command List, Top
 @appendix Tips and Hints
 Here are some tips for writing Texinfo documentation:@refill
 @cindex Tips
 Lisp.
 @item
 Write the indexing commands that refer to a whole section immediately
 after the section command, and write the indexing commands that refer to
-a paragraph before that paragraph.
+the paragraph before the paragraph.
+@need 1000
 In the example that follows, a blank line comes after the index
 entry for ``Leaping'':
 @example
 @group
 @code{@@bye}; it is as if the text were within @code{@@ignore} @dots{}
 @code{@@end ignore}.
 @end itemize
-@node Sample Texinfo File
+@node Sample Texinfo File, Sample Permissions, Tips, Top
 @appendix A Sample Texinfo File
 @cindex Sample Texinfo file, no comments
 Here is a complete, short sample Texinfo file, without any commentary.
 You can see this file, with comments, in the first chapter.
 @@contents
 @@bye
 @end example
-@node Sample Permissions
+@node Sample Permissions, Include Files, Sample Texinfo File, Top
 @appendix Sample Permissions
 @cindex Permissions
-@cindex Sample permissions
 @cindex Copying permissions
 Texinfo files should contain sections that tell the readers that they
 have the right to copy and distribute the Texinfo file, the Info file,
 and the printed manual.@refill
 Also, if you are writing a manual about software, you should explain
 that the software is free and either include the GNU General Public
 License (GPL) or provide a reference to it.  @xref{Distrib, ,
-Distribution, emacs, The GNU Emacs Manual}, for an example of the text
+Distribution, xemacs, XEmacs User's Manual}, for an example of the text
 that could be used in the software ``Distribution'', ``General Public
 License'', and ``NO WARRANTY'' sections of a document.  @xref{Copying,
 , Texinfo Copying Conditions}, for an example of a brief explanation
 of how the copying conditions provide you with rights. @refill
 * Titlepage Permissions::       Sample Titlepage copying permissions.
 @end menu
 @node Inserting Permissions, ifinfo Permissions, Sample Permissions, Sample Permissions
 @ifinfo
-@section Inserting Permissions
+@appendixsec Inserting Permissions
 @end ifinfo
 In a Texinfo file, the first @code{@@ifinfo} section usually begins
 with a line that says what the file documents.  This is what a person
 reading the unprocessed Texinfo file or using the advanced Info
 To make it simple to insert a permission notice into each section of
 the Texinfo file, sample permission notices for each section are
 reproduced in full below.@refill
-You may need to specify the correct name of a section mentioned in the
+Note that you may need to specify the correct name of a section
-permission notice.  For example, in @cite{The GDB Manual}, the name of
+mentioned in the permission notice.  For example, in @cite{The GDB
-the section referring to the General Public License is called the ``GDB
+Manual}, the name of the section referring to the General Public
-General Public License'', but in the sample shown below, that section is
+License is called the ``GDB General Public License'', but in the
-referred to generically as the ``GNU General Public License''.  If the
+sample shown below, that section is referred to generically as the
-Texinfo file does not carry a copy of the General Public License, leave
+``GNU General Public License''.  If the Texinfo file does not carry a
-out the reference to it, but be sure to include the rest of the
+copy of the General Public License, leave out the reference to it, but
-sentence.
+be sure to include the rest of the sentence.@refill
 @node ifinfo Permissions, Titlepage Permissions, Inserting Permissions, Sample Permissions
 @comment  node-name,  next,  previous,  up
-@section @samp{ifinfo} Copying Permissions
+@appendixsec @samp{ifinfo} Copying Permissions
 @cindex @samp{ifinfo} permissions
 In the @code{@@ifinfo} section of a Texinfo file, the standard Free
 Software Foundation permission notice reads as follows:@refill
 @example
 This file documents @dots{}
-Copyright 1999 Free Software Foundation, Inc.
+Copyright 1998 Free Software Foundation, Inc.
 Permission is granted to make and distribute verbatim
 copies of this manual provided the copyright notice and
 this permission notice are preserved on all copies.
 translation approved by the Free Software Foundation.
 @end example
 @node Titlepage Permissions,  , ifinfo Permissions, Sample Permissions
 @comment  node-name,  next,  previous,  up
-@section Titlepage Copying Permissions
+@appendixsec Titlepage Copying Permissions
 @cindex Titlepage permissions
 In the @code{@@titlepage} section of a Texinfo file, the standard Free
 Software Foundation copying permission notice follows the copyright
 notice and publishing information.  The standard phrasing is as
 except that this permission notice may be stated in a
 translation approved by the Free Software Foundation.
 @end example
-@node Include Files
+@node Include Files, Headings, Sample Permissions, Top
 @appendix 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
 * Include Files Evolution::     How use of the @code{@@include} command
 has changed over time.
 @end menu
 @node Using Include Files, texinfo-multiple-files-update, Include Files, Include Files
-@section How to Use Include Files
+@appendixsec How to Use Include Files
 @findex include
 To include another file within a Texinfo file, write the
 @code{@@include} command at the beginning of a line and follow it on
 the same line by the name of a file to be included.  For
 `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.@refill
 @node texinfo-multiple-files-update, Include File Requirements, Using Include Files, Include Files
-@section @code{texinfo-multiple-files-update}
+@appendixsec @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
 with a numeric prefix argument, such as @kbd{C-u 8}, the command
 updates @strong{every} pointer and menu in @strong{all} the files and then inserts a
 master menu.@refill
 @node Include File Requirements, Sample Include File, texinfo-multiple-files-update, Include Files
-@section Include File Requirements
+@appendixsec Include File Requirements
 @cindex Include file requirements
 @cindex Requirements for include files
 If you plan to use the @code{texinfo-multiple-files-update} command,
 the outer Texinfo file that lists included files within it should
 should @emph{not} contain any nodes besides the single `Top' node.  The
 @code{texinfo-multiple-files-update} command will not process
 them.@refill
 @node Sample Include File, Include Files Evolution, Include File Requirements, Include Files
-@section Sample File with @code{@@include}
+@appendixsec Sample File with @code{@@include}
 @cindex Sample @code{@@include} file
 @cindex Include file sample
 @cindex @code{@@include} file sample
 Here is an example of a complete outer Texinfo file with @code{@@include} files
 @end group
 @group
 @@page
 @@vskip 0pt plus 1filll
-Copyright @@copyright@{@} 1999 Free Software Foundation, Inc.
+Copyright @@copyright@{@} 1998 Free Software Foundation, Inc.
 @@end titlepage
 @end group
 @group
 @@ifinfo
 The full contents of @file{concept-index.texinfo} might be as simple as this:
 @example
 @group
-@@node Concept Index
+@@node Concept Index, , Second, Top
 @@unnumbered Concept Index
 @@printindex cp
 @end group
 @end example
-The outer Texinfo source file for @cite{The GNU Emacs Lisp Reference
+The outer Texinfo source file for @cite{The XEmacs Lisp Reference
 Manual} is named @file{elisp.texi}.  This outer file contains a master
 menu with 417 entries and a list of 41 @code{@@include}
 files.@refill
 @node Include Files Evolution,  , Sample Include File, Include Files
 @comment  node-name,  next,  previous,  up
-@section Evolution of Include Files
+@appendixsec Evolution of Include Files
 When Info was first created, it was customary to create many small
 Info files on one subject.  Each Info file was formatted from its own
 Texinfo source file.  This custom meant that Emacs did not need to
 make a large buffer to hold the whole of a large Info file when
 However, because large Info files are now split automatically, it is
 no longer necessary to keep them small.@refill
 Nowadays, multiple Texinfo files are used mostly for large documents,
-such as @cite{The GNU Emacs Lisp Reference Manual}, and for projects
+such as @cite{The XEmacs Lisp Reference Manual}, and for projects
 in which several different people write different sections of a
 document simultaneously.@refill
 In addition, the Info formatting commands have been extended to work
 with the @code{@@include} command so as to create a single large Info
 file that is split into smaller files if necessary.  This means that
 you can write menus and cross references without naming the different
 Texinfo files.@refill
-@node Headings
+@node Headings, Catching Mistakes, Include Files, Top
 @appendix Page Headings
 @cindex Headings
 @cindex Footings
 @cindex Page numbering
 @cindex Page headings
 flushleft; text for the middle part is centered; and, text for the
 right part is set flushright.@refill
 @node Heading Format, Heading Choice, Headings Introduced, Headings
 @comment  node-name,  next,  previous,  up
-@section Standard Heading Formats
+@appendixsec Standard Heading Formats
 Texinfo provides two standard heading formats, one for manuals printed
 on one side of each sheet of paper, and the other for manuals printed
 on both sides of the paper.
 and a colon.  This makes it easier to keep track of where you are in the
 manual.@refill
 @node Heading Choice, Custom Headings, Heading Format, Headings
 @comment  node-name,  next,  previous,  up
-@section Specifying the Type of Heading
+@appendixsec Specifying the Type of Heading
 @TeX{} does not begin to generate page headings for a standard Texinfo
 file until it reaches the @code{@@end titlepage} command.  Thus, the
 title and copyright pages are not numbered.  The @code{@@end
 titlepage} command causes @TeX{} to begin to generate page headings
 @noindent
 Texinfo lacks an @code{@@setchapternewpage even} command.@refill
 @node Custom Headings,  , Heading Choice, Headings
 @comment  node-name,  next,  previous,  up
-@section How to Make Your Own Headings
+@appendixsec How to Make Your Own Headings
 You can use the standard headings provided with Texinfo or specify
 your own.  By default, Texinfo has no footers, so if you specify them,
 the available page size for the main text will be slightly reduced.
+@c Following paragraph is verbose to prevent overfull hboxes.
 Texinfo provides six commands for specifying headings and
-footings:
+footings.  The @code{@@everyheading} command and
-@itemize @bullet
+@code{@@everyfooting} command generate page headers and footers
-@item
+that are the same for both even- and odd-numbered pages.
-@code{@@everyheading} @code{@@everyfooting} generate page headers and
+The @code{@@evenheading} command and @code{@@evenfooting}
-footers that are the same for both even- and odd-numbered pages.
+command generate headers and footers for even-numbered
-@item
+(left-hand) pages; and the @code{@@oddheading} command and
-@code{@@evenheading} and @code{@@evenfooting} command generate headers
+@code{@@oddfooting} command generate headers and footers for
-and footers for even-numbered (left-hand) pages.
+odd-numbered (right-hand) pages.@refill
-@item
-@code{@@oddheading} and @code{@@oddfooting} generate headers and footers
-for odd-numbered (right-hand) pages.
-@end itemize
 Write custom heading specifications in the Texinfo file immediately
 after the @code{@@end titlepage} command.  Enclose your specifications
 between @code{@@iftex} and @code{@@end iftex} commands since the
 @code{texinfo-format-buffer} command may not recognize them.  Also,
 Beware of overlong titles: they may overlap another part of the
 header or footer and blot it out.@refill
-@node Catching Mistakes
+@node Catching Mistakes, Refilling Paragraphs, Headings, Top
 @appendix Formatting Mistakes
 @cindex Structure, catching mistakes in
 @cindex Nodes, catching mistakes
 @cindex Catching mistakes
 @cindex Correcting mistakes
 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
 @comment  node-name,  next,  previous,  up
-@section Catching Errors with Info Formatting
+@appendixsec Catching Errors with Info Formatting
 @cindex Catching errors with Info formatting
 @cindex Debugging with Info formatting
 After you have written part of a Texinfo file, you can use the
 @code{texinfo-format-region} or the @code{makeinfo-region} command to
 @code{texinfo-format-xref} and @code{texinfo-format-parse-args}.
 Inside the function @code{texinfo-format-parse-args}, the function
 @code{re-search-forward} was called; it was this function that could
 not find the missing right-hand brace.@refill
-@xref{Lisp Debug, , Debugging Emacs Lisp, emacs, The GNU Emacs
+@xref{Lisp Debug, , Debugging Emacs Lisp, xemacs, XEmacs User's Manual},
-Manual}, for more information.@refill
+for more information.@refill
 @end ignore
 @node Debugging with TeX, Using texinfo-show-structure, Debugging with Info, Catching Mistakes
 @comment  node-name,  next,  previous,  up
-@section Catching Errors with @TeX{} Formatting
+@appendixsec Catching Errors with @TeX{} Formatting
 @cindex Catching errors with @TeX{} formatting
 @cindex Debugging with @TeX{} formatting
 You can also catch mistakes when you format a file with @TeX{}.@refill
 @item
 You can tell @TeX{} to stop this run by typing @kbd{x @key{RET}}
 at the @samp{?} prompt.@refill
 @end enumerate
-If you are running @TeX{} inside Emacs, you need to switch to the shell
+Please note that if you are running @TeX{} inside Emacs, you need to
-buffer and line at which @TeX{} offers the @samp{?} prompt.
+switch to the shell buffer and line at which @TeX{} offers the @samp{?}
+prompt.@refill
 Sometimes @TeX{} will format a file without producing error messages even
 though there is a problem.  This usually occurs if a command is not ended
 but @TeX{} is able to continue processing anyhow.  For example, if you fail
 to end an itemized list with the @code{@@end itemize} command, @TeX{} will
 instead of @samp{@@}; and in this circumstance, you are working
 directly with @TeX{}, not with Texinfo.)@refill
 @node Using texinfo-show-structure, Using occur, Debugging with TeX, Catching Mistakes
 @comment  node-name,  next,  previous,  up
-@section Using @code{texinfo-show-structure}
+@appendixsec Using @code{texinfo-show-structure}
 @cindex Showing the structure of a file
 @findex texinfo-show-structure
 It is not always easy to keep track of the nodes, chapters, sections, and
 subsections of a Texinfo file.  This is especially true if you are revising
 with the @code{@@section}, @code{@@subheading}, and @code{@@subsection}
 commands respectively.  If you move your cursor into the @samp{*Occur*}
 window, you can position the cursor over one of the lines and use the
 @kbd{C-c C-c} command (@code{occur-mode-goto-occurrence}), to jump to
 the corresponding spot in the Texinfo file.  @xref{Other Repeating
-Search, , Using Occur, emacs, The GNU Emacs Manual}, for more
+Search, , Using Occur, xemacs, XEmacs User's Manual}, for more
 information about @code{occur-mode-goto-occurrence}.@refill
 The first line in the @samp{*Occur*} window describes the @dfn{regular
 expression} specified by @var{texinfo-heading-pattern}.  This regular
 expression is the pattern that @code{texinfo-show-structure} looks for.
-@xref{Regexps, , Using Regular Expressions, emacs, The GNU Emacs Manual},
+@xref{Regexps, , Using Regular Expressions, xemacs, XEmacs User's Manual},
 for more information.@refill
 When you invoke the @code{texinfo-show-structure} command, Emacs will
 display the structure of the whole buffer.  If you want to see the
 structure of just a part of the buffer, of one chapter, for example,
 use the @kbd{C-x n n} (@code{narrow-to-region}) command to mark the
-region.  (@xref{Narrowing, , , emacs, The GNU Emacs Manual}.)  This is
+region.  (@xref{Narrowing, , , xemacs, XEmacs User's Manual}.)  This is
 how the example used above was generated.  (To see the whole buffer
 again, use @kbd{C-x n w} (@code{widen}).)@refill
 If you call @code{texinfo-show-structure} with a prefix argument by
 typing @w{@kbd{C-u C-c C-s}}, it will list lines beginning with
 the list in the @samp{*Occur*} window; and if you have mis-named a node
 or left out a section, you can correct the mistake.@refill
 @node Using occur, Running Info-Validate, Using texinfo-show-structure, Catching Mistakes
 @comment  node-name,  next,  previous,  up
-@section Using @code{occur}
+@appendixsec Using @code{occur}
 @cindex Occurrences, listing with @code{@@occur}
 @findex occur
 Sometimes the @code{texinfo-show-structure} command produces too much
 information.  Perhaps you want to remind yourself of the overall structure
 @end example
 @noindent
 and then, when prompted, type a @dfn{regexp}, a regular expression for
 the pattern you want to match.  (@xref{Regexps, , Regular Expressions,
-emacs, The GNU Emacs Manual}.)  The @code{occur} command works from
+xemacs, XEmacs User's Manual}.)  The @code{occur} command works from the
-the current location of the cursor in the buffer to the end of the
+current location of the cursor in the buffer to the end of the buffer.
-buffer.  If you want to run @code{occur} on the whole buffer, place
+If you want to run @code{occur} on the whole buffer, place the cursor at
-the cursor at the beginning of the buffer.@refill
+the beginning of the buffer.@refill
 For example, to see all the lines that contain the word
 @samp{@@chapter} in them, just type @samp{@@chapter}.  This will
 produce a list of the chapters.  It will also list all the sentences
 with @samp{@@chapter} in the middle of the line.@refill
 or phrase, end the last word with a @samp{$}; for example,
 @samp{catching mistakes$}.  This can be helpful when you want to see
 all the nodes that are part of the same chapter or section and
 therefore have the same `Up' pointer.@refill
-@xref{Other Repeating Search, , Using Occur, emacs , The GNU Emacs Manual},
+@xref{Other Repeating Search, , Using Occur, xemacs, XEmacs User's Manual},
 for more information.@refill
 @node Running Info-Validate,  , Using occur, Catching Mistakes
 @comment  node-name,  next,  previous,  up
-@section Finding Badly Referenced Nodes
+@appendixsec Finding Badly Referenced Nodes
 @findex Info-validate
 @cindex Nodes, checking for badly referenced
 @cindex Checking for badly referenced nodes
 @cindex Looking for badly referenced nodes
 @cindex Finding badly referenced nodes
 * Tagifying::                   How to tagify a file.
 * Splitting::                   How to split a file manually.
 @end menu
 @node Using Info-validate, Unsplit, Running Info-Validate, Running Info-Validate
-@subsection Running @code{Info-validate}
+@appendixsubsec Running @code{Info-validate}
 @cindex Running @code{Info-validate}
 @cindex Info validating a large file
 @cindex Validating a large file
 To use @code{Info-validate}, visit the Info file you wish to check and
 @example
 M-x Info-validate
 @end example
 @noindent
-Note that the @code{Info-validate} command requires an upper case
+(Note that the @code{Info-validate} command requires an upper case
 `I'.  You may also need to create a tag table before running
-@code{Info-validate}.  @xref{Tagifying}.
+@code{Info-validate}.  @xref{Tagifying}.)@refill
 If your file is valid, you will receive a message that says ``File appears
 valid''.  However, if you have a pointer that does not point to a node,
 error messages will be displayed in a buffer called @samp{*problems in
 info file*}.@refill
 `Previous' (in the node where the `Next' points) which points back.@refill
 @code{Info-validate} also checks that all menu entries and cross references
 point to actual nodes.@refill
-@code{Info-validate} requires a tag table and does not work with files
+Note that @code{Info-validate} requires a tag table and does not work
-that have been split.  (The @code{texinfo-format-buffer} command
+with files that have been split.  (The @code{texinfo-format-buffer}
-automatically splits large files.)  In order to use @code{Info-validate}
+command automatically splits large files.)  In order to use
-on a large file, you must run @code{texinfo-format-buffer} with an
+@code{Info-validate} on a large file, you must run
-argument so that it does not split the Info file; and you must create a
+@code{texinfo-format-buffer} with an argument so that it does not split
-tag table for the unsplit file.
+the Info file; and you must create a tag table for the unsplit
+file.@refill
 @node Unsplit, Tagifying, Using Info-validate, Running Info-Validate
 @comment  node-name,  next,  previous,  up
-@subsection Creating an Unsplit File
+@appendixsubsec Creating an Unsplit File
 @cindex Creating an unsplit file
 @cindex Unsplit file creation
 You can run @code{Info-validate} only on a single Info file that has a
 tag table.  The command will not work on the indirect subfiles that
 a tag table for it. @refill
 @cindex Making a tag table manually
 @cindex Tag table, making manually
 @node Tagifying, Splitting, Unsplit, Running Info-Validate
-@subsection Tagifying a File
+@appendixsubsec Tagifying a File
 After creating an unsplit Info file, you must create a tag table for
 it.  Visit the Info file you wish to tagify and type:@refill
 @example
 tag table and split the file automatically, or you can make the tag
 table and split the file manually.@refill
 @node Splitting,  , Tagifying, Running Info-Validate
 @comment  node-name,  next,  previous,  up
-@subsection Splitting a File Manually
+@appendixsubsec Splitting a File Manually
 @cindex Splitting an Info file manually
 @cindex Info file, splitting manually
 You should split a large file or else let the
 @code{texinfo-format-buffer} or @code{makeinfo-buffer} command do it
 for you automatically.  (Generally you will let one of the formatting
-commands do this job for you.  @xref{Creating an Info File}.)@refill
+commands do this job for you.  @xref{Create an Info File}.)@refill
 The split-off files are called the indirect subfiles.@refill
 Info files are split to save memory.  With smaller files, Emacs does not
 have make such a large buffer to hold the information.@refill
 The primary file still functions as an Info file, but it contains just
 the tag table and a directory of subfiles.@refill
-@node Refilling Paragraphs
+@node Refilling Paragraphs, Command Syntax, Catching Mistakes, Top
 @appendix Refilling Paragraphs
 @cindex Refilling paragraphs
 @cindex Filling paragraphs
-@cindex Paragraphs, filling
 @findex refill
 The @code{@@refill} command refills and, optionally, indents the first
 line of a paragraph.@footnote{Perhaps the command should have been
 called the @code{@@refillandindent} command, but @code{@@refill} is
 paragraph that should be filled.  They do not append @code{@@refill} to
 the ends of paragraphs that contain @code{@@*} or @w{@code{@@w@{ @dots{}@}}}
 and therefore do not refill or indent them.@refill
-@node Command Syntax
+@node Command Syntax, Obtaining TeX, Refilling Paragraphs, Top
+@comment node-name,  next,  previous,  up
 @appendix @@-Command Syntax
 @cindex @@-command syntax
-@cindex Syntax, of @@-commands
-@cindex Command syntax
 The character @samp{@@} is used to start special Texinfo commands.
 (It has the same meaning that @samp{\} has in plain @TeX{}.)  Texinfo
 has four types of @@-command:@refill
 does @emph{not} require braces.  @code{@@refill} never confuses the
 Emacs paragraph commands because it cannot appear at the beginning of
 a line.@refill
-@node Obtaining TeX
+@node Obtaining TeX, Command and Variable Index, Command Syntax, Top
 @appendix How to Obtain @TeX{}
 @cindex Obtaining @TeX{}
 @cindex @TeX{}, how to obtain
 @c !!! Here is information about obtaining TeX.  Update it whenever.
 @uref{ftp://tug.org/tex/unixtex.ftp}
 @uref{http://tug.org/unixtex.ftp}
 @end example
 The Free Software Foundation provides a core distribution on its Source
-Code CD-ROM suitable for printing Texinfo manuals.  To order it, contact:
+Code CD-ROM suitable for printing Texinfo manuals; the University of
+Washington maintains and supports a tape distribution; the @TeX{} Users
+Group co-sponsors a complete CD-ROM @TeX{} distribution.
+@itemize @bullet
+@item
+For the FSF Source Code CD-ROM, please contact:
+@iftex
 @display
 @group
 Free Software Foundation, Inc.
 59 Temple Place Suite 330
 Boston, MA @ @ 02111-1307
 @w{ } @w{ } @w{ } 0031-13-2473 (KDD)
 @w{ } @w{ } @w{ } 0066-3382-0158 (IDC)
 Electronic mail: @code{gnu@@gnu.org}
 @end group
 @end display
+@end iftex
+@ifinfo
+@display
+@group
+Free Software Foundation, Inc.
+59 Temple Place Suite 330
+Boston, MA @w{ } 02111-1307
+USA
+Telephone: @w{+1-617-542-5942}
+Fax: (including Japan) @w{+1-617-542-2652}
+Free Dial Fax (in Japan):
+@w{ } @w{ } @w{ } 0031-13-2473 (KDD)
+@w{ } @w{ } @w{ } 0066-3382-0158 (IDC)
+Electronic mail: @code{gnu@@gnu.org}
+@end group
+@end display
+@end ifinfo
+@item
+To order a complete distribution on CD-ROM, please see
+@uref{http://tug.org/tex-live.html}.  (This distribution is also
+available by FTP; see the URL's above.)
+@item
+To order a full distribution from the University of Washington on either
+a 1/4@dmn{in} 4-track QIC-24 cartridge or a 4@dmn{mm} DAT cartridge,
+send $210 to:
+@display
+@group
+Pierre A. MacKay
+Denny Hall, Mail Stop DH-10
+University of Washington
+Seattle, WA @w{ } 98195
+USA
+Telephone: +1-206-543-2268
+Electronic mail: @code{mackay@@cs.washington.edu}
+@end group
+@end display
+@noindent
+Please make checks payable to the University of Washington.
+Checks must be in U.S.@: dollars, drawn on a U.S.@: bank.  Overseas
+sites: please add to the base cost, if desired, $20.00 for shipment via
+air parcel post, or $30.00 for shipment via courier.
+@end itemize
 Many other @TeX{} distributions are available; see
 @uref{http://tug.org/}.
 @c These are no longer ``new'', and the explanations
 @c are all given elsewhere anyway, I think.  --karl, 25apr97.
-@c So ignore the entire appendix.
+@ignore (the entire appendix)
-@ignore
 @c node New Features, Command and Variable Index, Obtaining TeX, Top
 @c appendix Second Edition Features
 @tex
 % Widen the space for the first column so three control-character
 @@-commands.  This edition is more than twice the length of the first
 edition.@refill
 Here is a brief description of the new commands.@refill
-@c menu
+@menu
 * New Texinfo Mode Commands::   The updating commands are especially useful.
 * New Commands::                Many newly described @@-commands.
-@c end menu
+@end menu
 @c node New Texinfo Mode Commands, New Commands, Obtaining TeX, Obtaining TeX
 @c appendixsec New Texinfo Mode Commands
 Texinfo mode provides commands and features especially designed for
 @item M-x texinfo-sequential-node-update
 Insert node pointers in strict sequence.
 @end table
-@c no.de New Commands,  , New Texinfo Mode Commands, Obtaining TeX
+@c node New Commands,  , New Texinfo Mode Commands, Obtaining TeX
-@c appendix.sec New Texinfo @@-Commands
+@c appendixsec New Texinfo @@-Commands
 The second edition of the Texinfo manual describes more than 50
 commands that were not described in the first edition.  A third or so
 of these commands existed in Texinfo but were not documented in the
 manual; the others are new.  Here is a listing, with brief
 see @ref{Customized Highlighting},@*
 see @ref{Overfull hboxes},@*
 see @ref{Footnotes},@*
 see @ref{dmn, , Format a Dimension},@*
 see @ref{Raise/lower sections, , @code{@@raisesections} and @code{@@lowersections}},@*
-see @ref{math, , @code{@@math}: Inserting Mathematical Expressions}.@*
+see @ref{math, , @code{@@math} - Inserting Mathematical Expressions}.@*
 see @ref{minus, , Inserting a Minus Sign},@*
 see @ref{paragraphindent, , Paragraph Indenting},@*
 see @ref{Cross Reference Commands},@*
 see @ref{title subtitle author, , @code{@@title} @code{@@subtitle} and @code{@@author}}, and@*
 see @ref{Custom Headings, , How to Make Your Own Headings}.
 % Switch width of first column of tables back to default value
 \global\tableindent=.8in
 @end tex
 @end ignore
+@node Command and Variable Index, Concept Index, Obtaining TeX, Top
-@node Command and Variable Index
+@comment  node-name,  next,  previous,  up
 @unnumbered Command and Variable Index
 This is an alphabetical list of all the @@-commands, assorted Emacs Lisp
 functions, and several variables.  To make the list easier to use, the
 commands are listed without their preceding @samp{@@}.@refill
 @printindex fn
-@node Concept Index
+@node Concept Index,  , Command and Variable Index, Top
 @unnumbered Concept Index
 @printindex cp
+@summarycontents
+@contents
 @bye

Mercurial > hg > xemacs-beta

comparison man/texinfo.texi @ 430:a5df635868b2 r21-2-23