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

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/11/17 19:51:59

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

Log message:
        uniqify index entries

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1182&r2=1.1183
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.353&r2=1.354
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/htmlxref.cnf?cvsroot=texinfo&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1182
retrieving revision 1.1183
diff -u -b -r1.1182 -r1.1183
--- ChangeLog   16 Nov 2010 17:49:35 -0000      1.1182
+++ ChangeLog   17 Nov 2010 19:51:58 -0000      1.1183
@@ -1,3 +1,7 @@
+2010-11-17  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi: uniqify more index entries.
+
 2010-11-16  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi: uniqify some index entries.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -b -r1.353 -r1.354
--- doc/texinfo.txi     16 Nov 2010 17:49:36 -0000      1.353
+++ doc/texinfo.txi     17 Nov 2010 19:51:58 -0000      1.354
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.353 2010/11/16 17:49:36 karl Exp $
address@hidden $Id: texinfo.txi,v 1.354 2010/11/17 19:51:58 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.
 
@@ -901,7 +901,7 @@
 @xref{Creating and Installing Info Files}.
 
 @item Plain text
address@hidden Plain text output
address@hidden Plain text output, overview
 (Generated via @command{makeinfo --plaintext}.)  This is almost the
 same as Info output, except the navigational control characters are
 omitted.  Also, standard output is used by default.
@@ -940,9 +940,8 @@
 @uref{http://savannah.gnu.org/projects/teximpatient}.
 
 @item PDF
address@hidden PDF output
address@hidden PDF output, overview
 @cindex Beebe, Nelson
address@hidden pdftex
 (Generated via @command{texi2dvi --pdf} or @command{texi2pdf}.)  This
 format was developed by Adobe Systems for portable document
 interchange, based on their previous PostScript language.  It can
@@ -8461,8 +8460,8 @@
 @section @code{@@flushleft} and @code{@@flushright}
 @findex flushleft
 @findex flushright
address@hidden Ragged right
address@hidden Ragged left
address@hidden Ragged right, without filling
address@hidden Ragged left, without filling
 
 The @code{@@flushleft} and @code{@@flushright} commands line up the
 ends of lines on the left and right margins of a page,
@@ -8522,7 +8521,7 @@
 @node raggedright
 @section @code{@@raggedright}
 @findex raggedright
address@hidden Ragged right
address@hidden Ragged right, with filling
 
 The @code{@@raggedright} fills text as usual, but the text is only
 justified on the left; the right margin is ragged.  The command is
@@ -10070,9 +10069,9 @@
 required.
 
 @cindex Unique index entries
-It is best, though not required, for index entries to be unique.  That
-way, people using the printed output or online completion of index
-entries don't see undifferentiated lists.  Consider this an
+It is a good idea to make index entries unique wherever feasible.
+That way, people using the printed output or online completion of
+index entries don't see undifferentiated lists.  Consider this an
 opportunity to make otherwise-identical index entries be more
 specific, so readers can more easily find the exact place they are
 looking for.
@@ -11273,7 +11272,7 @@
 @node math
 @section @code{@@math}: Inserting Mathematical Expressions
 @findex math
address@hidden Mathematical expressions
address@hidden Mathematical expressions, inserting
 @cindex Formulas, mathematical
 
 You can write a short mathematical expression with the @code{@@math}
@@ -11767,7 +11766,7 @@
 Info file.
 
 @cindex White space, excessive
address@hidden Page breaks
address@hidden Page breaks, awkward
 For example, in a printed manual, page breaks may occur awkwardly in
 the middle of an example; to prevent this, you can hold text together
 using a grouping command that keeps the text from being split across
@@ -12106,7 +12105,7 @@
 
 @node page
 @section @code{@@page}: Start a New Page
address@hidden Page breaks
address@hidden Page breaks, forcing
 @findex page
 
 A line containing only @code{@@page} starts a new page in a printed
@@ -13201,13 +13200,13 @@
 @section A Sample Function Definition
 @cindex Function definitions
 @cindex Command definitions
address@hidden Macro definitions
address@hidden Macro definitions, programming-language
 @cindex Sample function definition
 
 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 address@hidden
+parameter list.
 
 Here is a definition from @ref{Calling Functions,,, elisp, The GNU Emacs
 Lisp Reference Manual}.
@@ -13515,7 +13514,7 @@
 @code{@@tex}.  You must use @code{\gdef} to do this, not @code{\def},
 because @code{@@tex} regions are processed in a @TeX{} group.
 
address@hidden Mathematical expressions
address@hidden Mathematical expressions, in plain @TeX{}
 As an example, here is a mathematical expression written in plain @TeX{}:
 
 @example
@@ -14142,7 +14141,7 @@
 @node Defining Macros
 @section Defining Macros
 @cindex Defining macros
address@hidden Macro definitions
address@hidden Macro definitions, Texinfo
 
 @findex macro
 You use the Texinfo @code{@@macro} command to define a macro, like this:
@@ -14999,7 +14998,6 @@
 @cindex Sorting indices
 @cindex Indices, sorting
 @cindex @TeX{} index sorting
address@hidden texindex
 
 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
@@ -16316,9 +16314,9 @@
 
 @item --no-headers
 @opindex --no-headers
address@hidden Node separators, omitting
address@hidden Node separators, omitting with @option{--no-headers}
 @cindex Generating plain text files with @option{--no-headers}
address@hidden Menus, omitting
address@hidden Menus, omitting with @option{--no-headers}
 Do not include menus or node separator lines in the output.
 
 When generating Info, this is the same as using @option{--plaintext},
@@ -16371,7 +16369,7 @@
 @itemx --no-validate
 @opindex --no-pointer-validate
 @opindex --no-validate
address@hidden Pointer validation, suppressing
address@hidden Pointer validation, suppressing from command line
 Suppress the pointer-validation phase of @code{makeinfo}---a dangerous
 thing to do.  This can also be done with the @code{@@novalidate}
 command (@pxref{Use TeX,,Use @TeX{}}).  Normally, after a Texinfo file
@@ -16452,12 +16450,12 @@
 
 @item --plaintext
 @opindex --plaintext
address@hidden Plain text output
address@hidden ASCII text output
address@hidden Plain text output with @option{--plaintext}
address@hidden ASCII text output with @option{--plaintext}
 @cindex Generating plain text files with @option{--plaintext}
address@hidden Node separators, omitting with @option{--plaintext}
address@hidden Menus, omitting with @option{--plaintext}
 @cindex @file{INSTALL} file, generating
address@hidden Node separators, omitting
address@hidden Menus, omitting
 Output a plain text file: do not include menus or node separator lines
 in the output.  This results in a straightforward plain text file that
 you can (for example) send in email without complications, or include
@@ -22949,7 +22947,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.353 2010/11/16 17:49:36 karl Exp $
+$Id: texinfo.txi,v 1.354 2010/11/17 19:51:58 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}
@@ -23028,7 +23026,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.353 2010/11/16 17:49:36 karl Exp $
address@hidden $Id: texinfo.txi,v 1.354 2010/11/17 19:51:58 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi

Index: util/htmlxref.cnf
===================================================================
RCS file: /sources/texinfo/texinfo/util/htmlxref.cnf,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- util/htmlxref.cnf   14 Nov 2010 18:24:18 -0000      1.35
+++ util/htmlxref.cnf   17 Nov 2010 19:51:58 -0000      1.36
@@ -1,6 +1,6 @@
 # htmlxref.cnf - reference file for Texinfo files on the web.
 
-htmlxrefversion=2010-11-14.17; # UTC
+htmlxrefversion=2010-11-16.19; # UTC
 
 # Copyright 2010 Free Software Foundation, Inc.
 # 
@@ -84,6 +84,12 @@
 
 ddrescue       mono    ${GS}/ddrescue/manual/ddrescue_manual.html
 
+DICO = http://puszcza.gnu.org.ua/software/dico/manual
+dico           mono    ${DICO}/dico.html
+dico           chapter ${DICO}/html_chapter/
+dico           section ${DICO}/html_section/
+dico           node    ${DICO}/html_node/
+
 diffutils      mono    ${GS}/diffutils/manual/diffutils.html
 
 ed             mono    ${GS}/ddrescue/manual/ed_manual.html