texinfo ChangeLog doc/texinfo.txi util/htmlxref...

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/11/26 18:41:26

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 
        util           : htmlxref.cnf 

Log message:
        small cleanups of node-related text

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1185&r2=1.1186
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.355&r2=1.356
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/htmlxref.cnf?cvsroot=texinfo&r1=1.37&r2=1.38

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1185
retrieving revision 1.1186
diff -u -b -r1.1185 -r1.1186
--- ChangeLog   26 Nov 2010 17:49:36 -0000      1.1185
+++ ChangeLog   26 Nov 2010 18:41:25 -0000      1.1186
@@ -1,3 +1,9 @@
+2010-11-26  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (node-related nodes): remove @refill, refill
+       source lines, small text changes.
+       (throughout): use "an <@@-command>" consistently, instead of "a".
+
 2010-11-26  Patrice Dumas  <address@hidden>
 
        * texi2html/texi2html.pl: don't warn whan a macro defined with

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -b -r1.355 -r1.356
--- doc/texinfo.txi     19 Nov 2010 00:51:39 -0000      1.355
+++ doc/texinfo.txi     26 Nov 2010 18:41:25 -0000      1.356
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.355 2010/11/19 00:51:39 karl Exp $
address@hidden $Id: texinfo.txi,v 1.356 2010/11/26 18:41:25 karl Exp $
 @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
 @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
 
@@ -3064,7 +3064,7 @@
 it appears on the title page.  Thus, the two do not need not match
 exactly.  A practice we recommend is to include the version or edition
 number of the manual in the @code{@@settitle} title; on the title page,
-the version number generally appears as a @code{@@subtitle} so it would
+the version number generally appears as an @code{@@subtitle} so it would
 be omitted from the @code{@@title}.  @xref{titlepage}.
 
 Conventionally, when @TeX{} formats a Texinfo file for double-sided
@@ -4067,7 +4067,7 @@
 
 @item @code{insert}
 Include normal paragraph indentation.  This respects the paragraph
-indentation set by a @code{@@paragraphindent} command
+indentation set by an @code{@@paragraphindent} command
 (@pxref{paragraphindent}).
 @end table
 
@@ -4541,10 +4541,10 @@
 @section @code{@@section}
 @findex section
 
-A @code{@@section} command identifies a section within a chapter unit,
-whether created with @code{@@chapter}, @code{@@unnumbered}, or
+An @code{@@section} command identifies a section within a chapter
+unit, whether created with @code{@@chapter}, @code{@@unnumbered}, or
 @code{@@appendix}, following the numbering scheme of the chapter-level
-command.  Thus, within a @code{@@chapter} chapter numbered `1', the
+command.  Thus, within an @code{@@chapter} chapter numbered `1', the
 section is numbered like `1.2'; within an @code{@@appendix}
 ``chapter'' labeled `A', the section is numbered like `A.2'; within an
 @code{@@unnumbered} chapter, the section gets no number.
@@ -4677,32 +4677,32 @@
 @findex subsubheading
 
 The fourth and lowest level sectioning commands in Texinfo are the
-`subsub' commands.  They are:@refill
+`subsub' commands.  They are:
 
 @table @code
 @item @@subsubsection
 Subsubsections are to subsections as subsections are to sections.
 (@xref{subsection, , @code{@@subsection}}.)  In a printed manual,
 subsubsection titles appear in the table of contents and are numbered
-four levels address@hidden
+four levels deep.
 
 @item @@unnumberedsubsubsec
 Unnumbered subsubsection titles appear in the table of contents of a
 printed manual, but lack numbers.  Otherwise, unnumbered
 subsubsections are the same as subsubsections.  In Info, unnumbered
-subsubsections look exactly like ordinary address@hidden
+subsubsections look exactly like ordinary subsubsections.
 
 @item @@appendixsubsubsec
 Conventionally, appendix commands are used only for appendices and are
 lettered and numbered appropriately in a printed manual.  They also
 appear in the table of contents.  In Info, appendix subsubsections look
-exactly like ordinary address@hidden
+exactly like ordinary subsubsections.
 
 @item @@subsubheading
 The @code{@@subsubheading} command may be used anywhere that you need
 a small heading that will not appear in the table of contents.  In
 Info, subsubheadings look exactly like ordinary subsubsection
address@hidden
+headings.
 @end table
 
 @code{@@unnumberedsubsubsec} and @code{@@appendixsubsubsec} do not
@@ -4713,7 +4713,7 @@
 
 
 In Info, `subsub' titles are underlined with periods.
-For example,@refill
+For example,
 
 @example
 @@subsubsection This is a subsubsection
@@ -4821,7 +4821,7 @@
 @noindent (Without the @code{@@raisesections}, all the subsequent
 sections in the document would be lowered.)
 
-If the included file being lowered has a @code{@@top} node, you'll
+If the included file being lowered has an @code{@@top} node, you'll
 need to conditionalize its inclusion with a flag (@pxref{set value}).
 
 Another difficulty can arise with documents that use the (recommended)
@@ -4862,7 +4862,8 @@
 
 Because node names are used in cross references, it is not desirable
 to casually change them.  Such name changes invalidate references from
-other manuals, from mail archives, and so on.
+other manuals, from mail archives, and so on.  @xref{HTML Xref Link
+Preservation}.
 
 @menu
 * Two Paths::                   Different commands to structure
@@ -4885,12 +4886,13 @@
 In Info, node and menu commands provide structure.  The chapter
 structuring commands generate headings with different kinds of
 underlining---asterisks for chapters, hyphens for sections, and so on;
-they do nothing address@hidden
+they do nothing else.  In HTML and other output formats, the situation
+is similar.
 
 @item
-In @TeX{}, the chapter structuring commands generate chapter and section
-numbers and tables of contents.  The node and menu commands provide
-information for cross references; they do nothing address@hidden
+In @TeX{}, the chapter structuring commands generate chapter and
+section numbers and tables of contents.  The node and menu commands
+provide information for cross references; they do nothing else.
 @end itemize
 
 You can use node pointers and menus to structure an Info file any way
@@ -4898,25 +4900,25 @@
 different structure than its printed output.  However, virtually all
 Texinfo files are written such that the structure for the Info output
 corresponds to the structure for the printed output.  It is neither
-convenient nor understandable to the reader to do address@hidden
+convenient nor understandable to the reader to do otherwise.
 
 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 address@hidden
+matching structure in the Info output.
 
 
 @node Node Menu Illustration
 @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 address@hidden
+file with three chapters, each of which contains two sections.
 
-The ``root'' is at the top of the diagram and the ``leaves'' are at the
-bottom.  This is how such a diagram is drawn conventionally; it
+The ``root'' is at the top of the diagram and the ``leaves'' are at
+the bottom.  This is how such a diagram is drawn conventionally; 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
address@hidden
+root.
 
 @example
 @group
@@ -4946,60 +4948,60 @@
 This @code{@@node} line says that the name of this node is ``Chapter
 2'', the name of the `Next' node is ``Chapter 3'', the name of the
 `Previous' node is ``Chapter 1'', and the name of the `Up' node is
-``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.
+``Top''.  You can (and should) omit writing out these node names if
+your document is hierarchically organized (@pxref{makeinfo Pointer
+Creation}), but the pointer relationships still obtain.
 
 @quotation Note
address@hidden 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
-chapter-level node, for example.  `Next' and `Previous' refer to nodes
-at the @emph{same} hierarchical level.  (The `Top' node contains the
-exception to this rule.  Since the `Top' node is the only node at that
-level, `Next' refers to the first following node, which is almost always
-a chapter or chapter-level node.)@refill
+`Next' and `Previous' refer to nodes at the @emph{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 chapter-level
+node, for example.  (The `Top' node contains the exception to this
+rule.  Since the `Top' node is the only node at that level, `Next'
+refers to the first following node, which is almost always a chapter
+or chapter-level node.)
 @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
+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:
 
 @example
 @group
    @@menu
    * Sect. 2.1::    Description of this section.
-   * Sect. 2.2::
+   * Sect. 2.2::    Description.
    @@end menu
 @end group
 @end example
 
-Write the node for Sect. 2.1 like this:@refill
+Write the node for Sect. 2.1 like this:
 
 @example
 @group
-   @@node     Sect. 2.1, Sect. 2.2, Chapter 2, Chapter 2
-   @@comment  node-name, next,      previous,  up
+@@node     Sect. 2.1, Sect. 2.2, Chapter 2, Chapter 2
+@@comment  node-name, next,      previous,  up
 @end group
 @end example
 
 In Info format, the `Next' and `Previous' pointers of a node usually
-lead to other nodes at the same level---from chapter to chapter or from
-section to section (sometimes, as shown, the `Previous' pointer points
-up); an `Up' pointer usually leads to a node at the level above (closer
-to the `Top' node); and a `Menu' leads to nodes at a level below (closer
-to `leaves').  (A cross reference can point to a node at any level;
-see @ref{Cross References}.)@refill
+lead to other nodes at the same level---from chapter to chapter or
+from section to section (sometimes, as shown, the `Previous' pointer
+points up); an `Up' pointer usually leads to a node at the level above
+(closer to the `Top' node); and a `Menu' leads to nodes at a level
+below (closer to `leaves').  (A cross reference can point to a node at
+any level; see @ref{Cross References}.)
 
 Usually, an @code{@@node} command and a chapter structuring command are
 used in sequence, along with indexing commands.  (You may follow the
 @code{@@node} line with a comment line that reminds you which pointer is
-which.)@refill
+which.)  The Texinfo processors look for this construct to determine
+the document structure.
 
 Here is the beginning of the chapter in this manual called ``Ending a
-Texinfo File''.  This shows an @code{@@node} line followed by a comment
-line, an @code{@@chapter} line, and then by indexing address@hidden
+Texinfo File''.  This shows an @code{@@node} line followed by a
+comment line, an @code{@@chapter} line, and then by indexing lines.
 
 @example
 @group
@@ -5029,8 +5031,7 @@
 the @code{@@node} line.  On the other hand, in printed output nodes
 are used only for cross references, so a chapter or section may
 contain any number of nodes.  Indeed, a chapter usually contains
-several nodes, one for each section, subsection, and
-subsubsection.
+several nodes, one for each section, subsection, and subsubsection.
 
 To specify a node, write an @code{@@node} command at the beginning of
 a line, and follow it with up to four arguments, separated by commas,
@@ -5091,7 +5092,7 @@
 of the node that follows the present node in that menu and its
 `Previous' pointer contains the name of the node that precedes it in
 that menu.  When a node's `Previous' node is the same as its `Up'
-node, both node pointers name the same node.
+node, both pointers name the same node.
 
 Usually, the first node of a Texinfo file is the `Top' node, and its
 `Up' and `Previous' pointers point to the @file{dir} file, which
@@ -5102,22 +5103,22 @@
 `Top' node.  @xref{First Node}, for information on how to write the
 first node of a Texinfo file.
 
-Even when you explicitly specify all pointers, that does not mean you
-can write the nodes in the Texinfo source file in an arbitrary order!
-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 output.
+Even when you explicitly specify all pointers, you cannot write the
+nodes in the Texinfo source file in an arbitrary order!  Because
address@hidden must process the file sequentially, irrespective of node
+pointers, you must write the nodes in the order you wish them to
+appear in the output.
 
 
 @node Writing a Node
address@hidden How to Write an @code{@@node} Line
address@hidden Writing an @code{@@node} Line
 @cindex Writing an @code{@@node} line
 @cindex @code{@@node} line writing
 @cindex Node line writing
 
-The easiest way to write an @code{@@node} line is to write @code{@@node}
-at the beginning of a line and then the name of the node, like
-this:
+The easiest and preferred way to write an @code{@@node} line is to
+write @code{@@node} at the beginning of a line and then the name of
+the node, like this:
 
 @example
 @@node @var{node-name}
@@ -5173,21 +5174,21 @@
 
 @itemize @bullet
 @item
-Try to pick node names that are informative but address@hidden
+Try to pick node names that are informative but short.
 
 In the Info file, the file name, node name, and pointer names are all
 inserted on one line, which may run into the right edge of the window.
-(This does not cause a problem with Info, but is ugly.)@refill
+(This does not cause a problem with Info, but is ugly.)
 
 @item
 Try to pick node names that differ from each other near the beginnings
 of their names.  This way, it is easy to use automatic name completion in
address@hidden
+Info.
 
 @item
 By convention, node names are capitalized just as they would be for
 section or chapter titles---initial and significant words are
-capitalized; others are address@hidden
+capitalized; others are not.
 @end itemize
 
 
@@ -5222,9 +5223,9 @@
 @cindex @@-commands in nodename
 @cindex Node name, should not contain @@-commands
 @@-commands in node names are not allowed.  This includes punctuation
-characters that are escaped with a @samp{@@}, such as @code{@@} and
address@hidden@{}, and accent commands such as @samp{@@'}.  Perhaps
-this limitation will be removed some day.
+characters that are escaped with an @samp{@@}, such as @code{@@} and
address@hidden@{}, and accent commands such as @samp{@@'}.  Perhaps this
+limitation will be removed some day.
 
 @item
 @cindex Colon in nodename
@@ -5500,14 +5501,14 @@
 subordinate nodes in a hierarchically structured document.  It is much
 better to use cross references to refer to arbitrary nodes.
 
-In the past, we recommended using a @samp{@@heading} command within an
address@hidden@@ifinfo} conditional instead of the normal sectioning commands
-after a very short node with a menu.  This had the advantage of making
-the printed output look better, because there was no very short text
-between two headings on the page.  But this also does not work with
address@hidden's implicit pointer creation, and it also makes the
-XML output incorrect, since it does not reflect the true document
-structure.  So, regrettably, we can no longer recommend this.
+In the past, we recommended using an @samp{@@heading} command within
+an @code{@@ifinfo} conditional instead of the normal sectioning
+commands after a very short node with a menu.  This had the advantage
+of making the printed output look better, because there was no very
+short text between two headings on the page.  But this also does not
+work with @command{makeinfo}'s implicit pointer creation, and it also
+makes the XML output incorrect, since it does not reflect the true
+document structure.  So, regrettably, we can no longer recommend this.
 
 
 @node Writing a Menu
@@ -6573,10 +6574,10 @@
 @code{@@xref} (@pxref{xref, , @code{@@xref}}).
 
 In past versions of Texinfo, it was not allowed to write punctuation
-after a @code{@@pxref}, so it could be used @emph{only} before a right
-parenthesis.  This is no longer the case, so now it can be used (for
-example) at the end of a sentence, where a lowercase ``see'' works
-best.  For instance:
+after an @code{@@pxref}, so it could be used @emph{only} before a
+right parenthesis.  This is no longer the case, so now it can be used
+(for example) at the end of a sentence, where a lowercase ``see''
+works best.  For instance:
 
 @example
 @dots{} For more information, @@address@hidden@}.
@@ -8202,11 +8203,11 @@
 significant, including tabs.  In the printed manual, the text is
 typeset in a fixed-width font, and not indented or filled.
 
-Write a @code{@@verbatim} command at the beginning of a line by itself.
-This line will disappear from the output.  Mark the end of the verbatim
-block with a @code{@@end verbatim} command, also written at the
-beginning of a line by itself.  The @code{@@end verbatim} will also
-disappear from the output.
+Write an @code{@@verbatim} command at the beginning of a line by
+itself.  This line will disappear from the output.  Mark the end of
+the verbatim block with an @code{@@end verbatim} command, also written
+at the beginning of a line by itself.  The @code{@@end verbatim} will
+also disappear from the output.
 
 For example:
 @c oops, got to trick this a bit: can't use @end verbatim inside @verbatim
@@ -9276,7 +9277,7 @@
 @findex headitemfont
 @cindex Font for multitable heading rows
 The command @code{@@headitemfont} can be used in templates when the
-entries in a @code{@@headitem} row need to be used in a template.  It
+entries in an @code{@@headitem} row need to be used in a template.  It
 is a synonym for @code{@@b}, but using @code{@@headitemfont} avoids
 any dependency on that particular font style, in case we provide a way
 to change it in the future.
@@ -9439,7 +9440,7 @@
 @cindex Captions, for floats
 @cindex Short captions, for lists of floats
 
-You may write an @code{@@caption} anywhere within a @code{@@float}
+You may write an @code{@@caption} anywhere within an @code{@@float}
 environment, to define a caption for the float.  It is not allowed in
 any other context.  @code{@@caption} takes a single argument, enclosed
 in braces.  Here's an example:
@@ -9492,7 +9493,7 @@
 @cindex Floats, list of
 @cindex Table of contents, for floats
 
-You can write a @code{@@listoffloats} command to generate a list of
+You can write an @code{@@listoffloats} command to generate a list of
 floats for a given float type (@pxref{float}), analogous to the
 document's overall table of contents.  Typically, it is written in its
 own @code{@@unnumbered} node to provide a heading and structure,
@@ -9798,7 +9799,7 @@
 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
+an @code{@@table} must be on the same line as the @code{@@item} (as
 usual).  @xref{Two-column Tables}.
 
 
@@ -14625,32 +14626,33 @@
 @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
address@hidden@@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.
+An @code{@@definfoenclose} command may be used to define a
+highlighting command for Info, but not for @TeX{}.  A command defined
+using @code{@@definfoenclose} marks text by enclosing it in strings
+that precede and follow the text.  You can use this to get closer
+control of your Info output.
 
 Presumably, if you define a command with @code{@@definfoenclose} for Info,
 you will create a corresponding command for @TeX{}, either in
 @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
+Write an @code{@@definfoenclose} command on a line and follow it with
 three arguments separated by commas.  The first argument to
address@hidden@@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 predefined macro
-(such as @code{@@emph}, @code{@@strong}, @code{@@t}, or @code{@@i}), the
-enclosure definition will override the built-in definition.
address@hidden@@definfoenclose} is the @@-command name (without the
address@hidden@@}); 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 an @code{@@definfoenclose} on the name of a predefined macro
+(such as @code{@@emph}, @code{@@strong}, @code{@@t}, or @code{@@i}),
+the enclosure definition will override the built-in definition.
 
 An enclosure command defined this way takes one argument in braces; this
 is intended for new markup commands (@pxref{Marking Text}).
@@ -16401,7 +16403,7 @@
 @opindex address@hidden
 @opindex -o @var{file}
 Specify that the output should be directed to @var{file}.  This
-overrides any file name specified in a @code{@@setfilename} command
+overrides any file name specified in an @code{@@setfilename} command
 found in the Texinfo source.  If neither @code{@@setfilename} nor this
 option are specified, the input file name is used to determine the
 output name.  @xref{setfilename,,@code{@@setfilename}}.
@@ -16740,11 +16742,12 @@
 For HTML.
 Use entities for doubled single-quote characters (@pxref{Inserting Quotation 
Marks}, @samp{---} and @samp{--} 
 (@pxref{Conventions, General Syntactic Conventions}).
+
 @item SPLIT_INDEX
-For HTML.
-If set, document is split, and a @code{@@printindex} happens in a sectioning 
-element at the level of splitting, then split index pages at the next letter
-after they have more than that many entries. If set to 0, no index splitting.
+For HTML.  If set, document is split, and an @code{@@printindex}
+happens in a sectioning element at the level of splitting, then split
+index pages at the next letter after they have more than that many
+entries. If set to 0, no index splitting.
 @item IN_ENCODING
 Input file encoding using perl encoding names. Set according to 
 @code{@@documentencoding}.
@@ -18342,7 +18345,7 @@
 An @code{@@image} command is replaced by the filename (first)
 argument.  @xref{Images}.
 
-A @code{@@verb} command is replaced by its transformed argument.
+An @code{@@verb} command is replaced by its transformed argument.
 @xref{verb}.
 
 Any other command is an error, and the result is unspecified.
@@ -18575,6 +18578,7 @@
 @cindex Old nodes, preserving links to
 @cindex Renaming nodes, and preserving links
 @cindex Links, preserving to renamed nodes
address@hidden Node renaming, and preserving links
 
 Occasionally changes in a program require removing (or renaming) nodes
 in the manual in order to have the best documentation.  Given the
@@ -18582,6 +18586,7 @@
 node (renaming appears the same as removal for this purpose), and it's
 not ideal for those links to simply break.
 
address@hidden RENAMED_NODES_FILE
 Therefore, Texinfo provides a way for manual authors to specify old
 node names and the new nodes to which the old names should be
 redirected, via the file @address@hidden, where
@@ -18608,7 +18613,7 @@
 Thus, external links to the old node are preserved.
 
 Lines consisting only of whitespace are ignored.  Comments are
-indicated with a @samp{@@c} at the beginning of a line, optionally
+indicated with an @samp{@@c} at the beginning of a line, optionally
 preceded by whitespace.
 
 
@@ -19653,7 +19658,7 @@
 Expansion can be prevented by setting the key @code{keep_texi} in the
 @code{state} hash.
 
-When a @code{@@documentlanguage} line appears in the document and the
+When an @code{@@documentlanguage} line appears in the document and the
 language was not set on the command line, it is convenient for the
 translations to redefine some variables based on the new language.
 Therefore, Texinfo has a function reference which is called each time
@@ -19710,14 +19715,14 @@
 @item Top element
 @cindex Top element
 The top element is the highest element in the document structure.  If
-the document has a @code{@@top} section (@pxref{makeinfo top}), it is
+the document has an @code{@@top} section (@pxref{makeinfo top}), it is
 the element associated with that section; otherwise, it is the element
 associated with the document's @code{@@node Top} (@pxref{The Top
 Node}).  If there is no @code{@@node Top}, the first element in the
 document is the top element.
 
 The top element may end up formatted differently from normal elements
-if there is a @code{@@top} section or the @code{@@node Top} is not
+if there is an @code{@@top} section or the @code{@@node Top} is not
 associated with a sectioning command.
 
 @item Miscellaneous elements
@@ -20995,7 +21000,7 @@
 The two-letter name of the index. 
 
 @item $is_printed
-True if this index has a @code{@@printindex} command.
+True if this index has a corresponding @code{@@printindex} command.
 
 @item $manual_name
 The manual basename.
@@ -21029,7 +21034,7 @@
 The formatted header of the element containing the index entry. 
 
 @item $is_printed
-True if this index has a @code{@@printindex} command.
+True if this index has a corresponding @code{@@printindex} command.
 
 @item $manual_name
 The manual basename.
@@ -21258,7 +21263,7 @@
 starts a comment.  @xref{Comments}.
 
 @item @@caption
-Define the full caption for a @code{@@float}.  @xref{caption shortcaption}.
+Define the full caption for an @code{@@float}.  @xref{caption shortcaption}.
 
 @item @@cartouche
 Highlight an example or quotation by drawing a box with rounded
@@ -22059,7 +22064,7 @@
 @code{@@settitle}}.
 
 @item @@shortcaption
-Define the short caption for a @code{@@float}.  @xref{caption shortcaption}.
+Define the short caption for an @code{@@float}.  @xref{caption shortcaption}.
 
 @item @@shortcontents
 Print a short table of contents, with chapter-level entries only.  Not
@@ -22946,7 +22951,7 @@
 (@url{http://www.gnu.org/software/rcs}) version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.355 2010/11/19 00:51:39 karl Exp $
+$Id: texinfo.txi,v 1.356 2010/11/26 18:41:25 karl Exp $
 @end example
 (This is useful in all sources that use version control, not just manuals.)
 You may wish to include the @samp{$Id:} comment in the @code{@@copying}
@@ -23025,7 +23030,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.355 2010/11/19 00:51:39 karl Exp $
address@hidden $Id: texinfo.txi,v 1.356 2010/11/26 18:41:25 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi
@@ -24664,8 +24669,8 @@
 line.
 
 @item <copying text>
-The expansion of a @code{@@copying} environment, if
-the manual has one (@pxref{copying}).
+The expansion of an @code{@@copying} environment, if the manual has
+one (@pxref{copying}).
 
 @item <dir entries>
 The result of any @code{@@dircategory} and @code{@@direntry}

Index: util/htmlxref.cnf
===================================================================
RCS file: /sources/texinfo/texinfo/util/htmlxref.cnf,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- util/htmlxref.cnf   19 Nov 2010 00:51:39 -0000      1.37
+++ util/htmlxref.cnf   26 Nov 2010 18:41:26 -0000      1.38
@@ -1,6 +1,6 @@
 # htmlxref.cnf - reference file for Texinfo files on the web.
 
-htmlxrefversion=2010-11-18.18; # UTC
+htmlxrefversion=2010-11-26.17; # UTC
 
 # Copyright 2010 Free Software Foundation, Inc.
 # 
@@ -55,12 +55,12 @@
 bash           mono    ${GS}/bash/manual/bash.html
 bash           node    ${GS}/bash/manual/html_node/
 
-BINU = http://sourceware.org/binutils/docs
-binutils       node    ${BINU}/binutils/
- as            node    ${BINU}/as/
- bfd           node    ${BINU}/bfd/
- gprof         node    ${BINU}/gprof/
- ld            node    ${BINU}/ld/
+BINUTILS = http://sourceware.org/binutils/docs
+binutils       node    ${BINUTILS}/binutils/
+ as            node    ${BINUTILS}/as/
+ bfd           node    ${BINUTILS}/bfd/
+ gprof         node    ${BINUTILS}/gprof/
+ ld            node    ${BINUTILS}/ld/
 
 bison          mono    ${GS}/bison/manual/bison.html
 bison          node    ${GS}/bison/manual/html_node/
@@ -202,13 +202,21 @@
 gcal           mono    ${GS}/gcal/manual/gcal.html
 gcal           node    ${GS}/gcal/manual/html_node/
 
-gccint         node    http://gcc.gnu.org/onlinedocs/gccint/
- cpp           node    http://gcc.gnu.org/onlinedocs/gccint/
- gcj           node    http://gcc.gnu.org/onlinedocs/gcj/
- gfortran      node    http://gcc.gnu.org/onlinedocs/gfortran/
- gnat_rm       node    http://gcc.gnu.org/onlinedocs/gnat_rm/
- gnat_ugn_unw  node    http://gcc.gnu.org/onlinedocs/gnat_ugn_unw/
- libgomp       node    http://gcc.gnu.org/onlinedocs/libgomp/
+GCC = http://gcc.gnu.org/onlinedocs
+gcc            node    ${GCC}/gcc/
+ cpp           node    ${GCC}/gccint/
+ gcj           node    ${GCC}/gcj/
+ gfortran      node    ${GCC}/gfortran/
+ gnat_rm       node    ${GCC}/gnat_rm/
+ gnat_ugn_unw  node    ${GCC}/gnat_ugn_unw/
+ libgomp       node    ${GCC}/libgomp/
+ libstdc++     node    ${GCC}/libstdc++/
+ #
+ gccint                node    ${GCC}/gccint/
+ cppinternals  node    ${GCC}/cppinternals/
+ gfc-internals node    ${GCC}/gfc-internals/
+ gnat-style    node    ${GCC}/gnat-style/
+ libiberty     node    ${GCC}/libiberty/
 
 GDB = http://sourceware.org/gdb/current/onlinedocs
 gdb            node    ${GDB}/gdb/
@@ -222,6 +230,8 @@
 
 global         mono    ${GS}/global/manual/global.html
 
+gmediaserver   node    ${GS}/gmediaserver/manual/
+
 gmp            mono    ${GS}/gmp/manual/html_mono/gmp.html
 gmp            node    ${GS}/gmp/manual/html_node/
 
@@ -240,6 +250,12 @@
 gnulib         mono    ${GS}/gnulib/manual/gnulib.html
 gnulib         node    ${GS}/gnulib/manual/html_node/
 
+GNUN = ${GS}/trans-coord/manual
+gnun           mono    ${GNUN}/gnun/gnun.html
+gnun           node    ${GNUN}/gnun/html_node/
+ web-trans     mono    ${GNUN}/web-trans/web-trans.html
+ web-trans     node    ${GNUN}/web-trans/html_node/
+
 GNUPG = http://www.gnupg.org/documentation/manuals
 gnupg          node    ${GNUPG}/gnupg/
  dirmngr       node    ${GNUPG}/dirmngr/
@@ -249,8 +265,17 @@
  assuan                node    ${GNUPG}/assuan/
  gpgme         node    ${GNUPG}/gpgme/
 
+gnuprologjava  node    ${GS}/gnuprologjava/manual/
+
 gnuschool      mono    ${GS}/gnuschool/gnuschool.html
 
+GNUSTANDARDS = ${G}/prep
+ maintain      mono    ${GNUSTANDARDS}/maintain/maintain.html
+ maintain      node    ${GNUSTANDARDS}/maintain/html_node/
+ #
+ standards     mono    ${GNUSTANDARDS}/standards/standards.html
+ standards     node    ${GNUSTANDARDS}/standards/html_node/
+
 gnutls         mono    ${GS}/gnutls/manual/gnutls.html
 gnutls         node    ${GS}/gnutls/manual/html_node/
 
@@ -268,6 +293,8 @@
 gsasl          mono    ${GS}/gsasl/manual/gsasl.html
 gsasl          node    ${GS}/gsasl/manual/html_node/
 
+gsl            node    ${GS}/gsl/manual/html_node/
+
 gss            mono    ${GS}/gss/manual/gss.html
 gss            node    ${GS}/gss/manual/html_node/
 
@@ -294,6 +321,8 @@
  clutter       node    ${GUILE_GNOME}/clutter/html/
  clutter-glx   node    ${GUILE_GNOME}/clutter-glx/html/
 
+guile-gtk      node    ${GS}/guile-gtk/docs/guile-gtk/
+
 guile-rpc      mono    ${GS}/guile-rpc/manual/guile-rpc.html
 guile-rpc      node    ${GS}/guile-rpc/manual/html_node/
 
@@ -340,9 +369,6 @@
 mailutils      mono    ${GS}/mailutils/manual/mailutils.html
 mailutils      node    ${GS}/mailutils/manual/html_node/
 
-maintain       mono    ${G}/prep/maintain/maintain.html
-maintain       node    ${G}/prep/maintain/html_node/
-
 make           mono    ${GS}/make/manual/make.html
 make           node    ${GS}/make/manual/html_node/
 
@@ -390,9 +416,6 @@
 
 src-highlite   mono    ${GS}/src-highlite/source-highlight.html
 
-standards      mono    ${G}/prep/standards/standards.html
-standards      node    ${G}/prep/standards/html_node/
-
 swbis          mono    ${GS}/swbis/manual.html
 
 tar            mono    ${GS}/tar/manual/tar.html
@@ -400,14 +423,15 @@
 tar            section ${GS}/tar/manual/html_section/
 tar            node    ${GS}/autoconf/manual/html_node/
 
-texinfo                mono    ${GS}/texinfo/manual/texinfo/texinfo.html
-texinfo                node    ${GS}/texinfo/manual/texinfo/html_node/
+TEXINFO = ${GS}/texinfo/manual
+texinfo                mono    ${TEXINFO}/texinfo/texinfo.html
+texinfo                node    ${TEXINFO}/texinfo/html_node/
  #
- info          mono    ${GS}/texinfo/manual/info/info.html
- info          node    ${GS}/texinfo/manual/info/html_node/
+ info          mono    ${TEXINFO}/info/info.html
+ info          node    ${TEXINFO}/info/html_node/
  #
- info-stnd     mono    ${GS}/texinfo/manual/info-stnd/info-stnd.html
- info-stnd     node    ${GS}/texinfo/manual/info-stnd/html_node/
+ info-stnd     mono    ${TEXINFO}/info-stnd/info-stnd.html
+ info-stnd     node    ${TEXINFO}/info-stnd/html_node/
 
 units          mono    ${GS}/units/manual/units.html
 units          node    ${GS}/units/manual/html_node/