texinfo ChangeLog doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/09/26 18:37:43

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        avoid more duplicated index entries

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1150&r2=1.1151
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.321&r2=1.322

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1150
retrieving revision 1.1151
diff -u -b -r1.1150 -r1.1151
--- ChangeLog   25 Sep 2010 14:34:31 -0000      1.1150
+++ ChangeLog   26 Sep 2010 18:37:42 -0000      1.1151
@@ -1,3 +1,7 @@
+2010-09-26  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi: Avoid more duplicated index entries.
+
 2010-09-25  Patrice Dumas  <address@hidden>
 
        * texi2html/texi2html.pl (enter_index_entry),

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -b -r1.321 -r1.322
--- doc/texinfo.txi     25 Sep 2010 00:52:52 -0000      1.321
+++ doc/texinfo.txi     26 Sep 2010 18:37:43 -0000      1.322
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.321 2010/09/25 00:52:52 karl Exp $
address@hidden $Id: texinfo.txi,v 1.322 2010/09/26 18:37:43 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.
 
@@ -4992,7 +4992,7 @@
 your Texinfo document is hierarchically organized (@pxref{makeinfo
 Pointer Creation}).
 
address@hidden address@hidden, in HTML output}
address@hidden address@hidden, in HTML output of nodes}
 Whether the node pointers are specified implicitly or explicitly, the
 HTML output from @command{makeinfo} for each node includes links to
 the `Next', `Previous', and `Up' nodes.  The HTML also uses the
@@ -5494,7 +5494,7 @@
 entries.  Space characters in a menu are preserved as-is; this allows
 you to format the menu as you wish.
 
address@hidden address@hidden, in HTML output}
address@hidden address@hidden, in HTML output of menus}
 In the HTML output from @command{makeinfo}, the @code{accesskey}
 attribute is used with the values @address@hidden@samp{9} for the
 first nine entries.  This allows people using web browsers to follow
@@ -15076,7 +15076,7 @@
 texi2dvi foo.texi} instead of relying on the operating system to invoke
 the shell on the @samp{texi2dvi} script.
 
address@hidden --command @r{(@command{texi2dvi})}
address@hidden address@hidden, for @command{texi2dvi}}
 One useful option to @code{texi2dvi} is @address@hidden
 This inserts @var{cmd} on a line by itself after the
 @code{@@setfilename} in a temporary copy of the input file before
@@ -15087,7 +15087,7 @@
 (You can also do this on a site-wide basis with @file{texinfo.cnf};
 @pxref{Preparing for TeX,,Preparing for @TeX{}}).
 
address@hidden --pdf @r{(@command{texi2dvi})}
address@hidden address@hidden, for @command{texi2dvi}}
 With the @option{--pdf} option, @command{texi2dvi} produces PDF output
 instead of DVI (@pxref{PDF Output}), by running @command{pdftex}
 instead of @command{tex}.  Alternatively, the command
@@ -15100,7 +15100,7 @@
 @command{texi2dvi} can also be used to process @LaTeX{} files; simply
 run @samp{texi2dvi filename.ext}.
 
address@hidden --language @r{(@command{texi2dvi})}
address@hidden address@hidden, for @command{texi2dvi}}
 Normally @command{texi2dvi} is able to guess the input file language
 by its contents and file name suffix. If, however, it fails to do so
 you can specify the input language using
@@ -15113,7 +15113,7 @@
 the @TeX{} programming in some cases, and provide additional tracing
 information when debugging @file{texinfo.tex}.
 
address@hidden --translate-file @r{(@command{texi2dvi})}
address@hidden address@hidden, for @command{texi2dvi}}
 Several options are provided for handling documents, written in
 character sets other than ASCII. The
 @address@hidden option instructs
@@ -15122,7 +15122,7 @@
 files, TCX files: Character translations, web2c, Web2c: A @TeX{}
 implementation}).
 
address@hidden --recode @r{(@command{texi2dvi})}
address@hidden address@hidden, for @command{texi2dvi}}
 The options @option{--recode} and @address@hidden
 allow conversion of an input document before running @TeX{}. The
 @option{--recode} option recodes the document from encoding specified
@@ -15130,7 +15130,7 @@
 (@pxref{documentencoding,,@code{documentencoding}}) to plain 7-bit
 @samp{texinfo} encoding.
 
address@hidden --recode-from @r{(@command{texi2dvi})}
address@hidden address@hidden, for @command{texi2dvi}}
 The option @address@hidden recodes the document from
 @var{enc} encoding to the encoding specified by
 @samp{@@documentencoding}. This is useful, for example, if the
@@ -16111,7 +16111,7 @@
 
 @item --help
 @itemx -h
address@hidden --help
address@hidden address@hidden, for @command{texi2any}}
 @opindex -h
 Print a usage message listing available options, then exit successfully.
 
@@ -16397,7 +16397,7 @@
 
 @item --version
 @itemx -V
address@hidden --version
address@hidden address@hidden, for @command{texi2any}}
 @opindex -V
 Print the version number, then exit successfully.
 
@@ -17513,21 +17513,22 @@
 Options:
 
 @table @code
address@hidden --add-once
address@hidden address@hidden, for @command{install-info}}
 Specifies that the entry or entries will only be put into a single section.
 
 @item address@hidden
address@hidden address@hidden
address@hidden address@hidden@r{, for @command{install-info}}
 Specifies the column that the second and subsequent lines of menu entry's
 description will be formatted to begin at.  The default for this option is
 @samp{35}.  It is used in conjunction with the @samp{--max-width} option.
 @var{column} starts counting at 1.
 
 @item --append-new-sections
address@hidden --append-new-sections{, for @command{install-info}}
 Instead of alphabetizing new sections, place them at the end of the DIR file.
 
 @item address@hidden
address@hidden address@hidden
address@hidden address@hidden@r{, for @command{install-info}}
 Specifies the column that the first line of menu entry's description will
 be formatted to begin at.  The default for this option is @samp{33}.  It is
 used in conjunction with the @samp{--max-width} option.
@@ -17536,33 +17537,33 @@
 @var{column} starts counting at 1.
 
 @item --debug
address@hidden --debug
address@hidden address@hidden, for @command{install-info}}
 Report what is being done.
 
 @item --delete
address@hidden --delete
address@hidden address@hidden, for @command{install-info}}
 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.
 Any empty sections that result from the removal are also removed.
 
 @item address@hidden
address@hidden address@hidden
address@hidden address@hidden@r{, for @command{install-info}}
 Specify the explanatory portion of the menu entry.  If you don't specify
 a description (either via @samp{--entry}, @samp{--item} or this option),
 the description is taken from the Info file itself.
 
 @item address@hidden
address@hidden address@hidden
address@hidden address@hidden@r{, for @command{install-info}}
 Specify file name of the Info directory file.  This is equivalent to
 using the @var{dir-file} argument.
 
 @item --dry-run
address@hidden --dry-run
address@hidden address@hidden, for @command{install-info}}
 Same as @samp{--test}.
 
 @item address@hidden
address@hidden address@hidden
address@hidden address@hidden@r{, for @command{install-info}}
 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
@@ -17570,49 +17571,49 @@
 information in the Info file itself.
 
 @item --help
address@hidden --help
address@hidden address@hidden, for @command{texindex}}
 Display a usage message with basic usage and all available options,
 then exit successfully.
 
 @item address@hidden
address@hidden address@hidden
address@hidden address@hidden@r{, for @command{install-info}}
 Specify Info file to install in the directory.  This is
 equivalent to using the @var{info-file} argument.
 
 @item address@hidden
address@hidden address@hidden
address@hidden address@hidden@r{, for @command{install-info}}
 Specify the directory where the directory file @file{dir} resides.
 Equivalent to @address@hidden/dir}.
 
 @item address@hidden
address@hidden address@hidden
address@hidden address@hidden@r{, for @command{install-info}}
 Same as @samp{--info-dir}.
 
 @item address@hidden
address@hidden address@hidden
address@hidden address@hidden@r{, for @command{install-info}}
 Same as @address@hidden  An Info directory entry is actually
 a menu item.
 
 @item --keep-old
address@hidden --keep-old
address@hidden address@hidden, for @command{install-info}}
 Do not replace pre-existing menu entries.  When @samp{--remove} is specified,
 this option means that empty sections are not removed.
 
 @item address@hidden
address@hidden address@hidden
address@hidden address@hidden@r{, for @command{install-info}}
 Specifies the column that the menu entry's description will be word-wrapped
 at.  @var{column} starts counting at 1.
 
 @item address@hidden
address@hidden address@hidden
address@hidden address@hidden@r{, for @command{install-info}}
 Same as @samp{--max-width}.
 
 @item address@hidden
address@hidden address@hidden
address@hidden address@hidden@r{, for @command{install-info}}
 Same as @samp{--name}.
 
 @item address@hidden
address@hidden address@hidden
address@hidden address@hidden@r{, for @command{install-info}}
 Specify the name portion of the menu entry.  If the @var{text} does
 not start with an asterisk @samp{*}, it is presumed to be the text
 after the @samp{*} and before the parentheses that specify the Info
@@ -17624,27 +17625,27 @@
 of the Info file is used.
 
 @item --no-indent
address@hidden --no-indent
address@hidden address@hidden, for @command{install-info}}
 Suppress formatting of new entries into the @file{dir} file.
 
 @item --quiet
address@hidden --quiet
 @itemx --silent
address@hidden --silent
address@hidden address@hidden, for @command{install-info}}
address@hidden address@hidden, for @command{install-info}}
 Suppress warnings, etc., for silent operation.
 
 @item --remove
address@hidden --remove
address@hidden address@hidden, for @command{install-info}}
 Same as @samp{--delete}.
 
 @item --remove-exactly
address@hidden --remove-exactly
address@hidden address@hidden, for @command{install-info}}
 Also like @samp{--delete}, but only entries if the Info file name
 matches exactly; @code{.info} and/or @code{.gz} suffixes are
 @emph{not} ignored.
 
 @item address@hidden
address@hidden address@hidden
address@hidden address@hidden@r{, for @command{install-info}}
 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
@@ -17652,7 +17653,7 @@
 a section, the menu entries are put into the Miscellaneous section.
 
 @item --section @var{regex} @var{sec}
address@hidden --section @var{regex} @var{sec}
address@hidden --section @var{regex} @address@hidden, for 
@command{install-info}}
 Same as @address@hidden address@hidden --add-once}.
 
 @code{install-info} tries to detect when this alternate syntax is used,
@@ -17662,31 +17663,33 @@
 @item
 If the second argument to @code{--section} starts with a hyphen, the
 original syntax is presumed.
+
 @item
 If the second argument to @code{--section} is a file that can be
 opened, the original syntax is presumed.
+
 @item
 Otherwise the alternate syntax is used.
 @end enumerate
 
-When heuristic fails because your section title starts with a hyphen, or it
-happens to be a filename that can be opened, the syntax should be changed
-to @address@hidden address@hidden --add-once}.
-
+When the heuristic fails because your section title starts with a
+hyphen, or it happens to be a filename that can be opened, the syntax
+should be changed to @address@hidden address@hidden
+--add-once}.
 
 @item address@hidden
address@hidden  address@hidden
address@hidden  address@hidden@r{, for @command{install-info}}
 Put this file's entries into any section that matches @var{regex}.  If
 more than one section matches, all of the entries are added in each of the
 sections.  Specify @var{regex} using basic regular expression syntax, more
 or less as used with @command{grep}, for example.
 
 @item --test
address@hidden --test
address@hidden address@hidden, for @command{install-info}}
 Suppress updating of the directory file.
 
 @item --version
address@hidden --version
address@hidden address@hidden, for @command{install-info}}
 @cindex Version number, for install-info
 Display version information and exit successfully.
 
@@ -20085,7 +20088,7 @@
 @code{$AFTER_BODY_OPEN} is added just after @code{<body>} is output.
 These variables are empty by default.
 
address@hidden BODYTEXT
address@hidden address@hidden, in customization}
 @cindex @code{<body>}, attributes of
 The @code{<body>} element attributes may be set by defining the
 configuration variable @code{BODYTEXT}.
@@ -20105,7 +20108,7 @@
 configuration variable) is used in the header
 (@pxref{documentdescription}).
 
address@hidden @@LINKS_BUTTONS
address@hidden @@address@hidden, in customization}
 @vindex address@hidden, in customization}
 @code{<link>} elements are used in the header if @code{$USE_LINKS} is
 set, in which case @code{@@LINKS_BUTTONS} determines which links are
@@ -24637,7 +24640,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.321 2010/09/25 00:52:52 karl Exp $
+$Id: texinfo.txi,v 1.322 2010/09/26 18:37:43 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}
@@ -24716,7 +24719,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.321 2010/09/25 00:52:52 karl Exp $
address@hidden $Id: texinfo.txi,v 1.322 2010/09/26 18:37:43 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi