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

[Karl Berry]

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

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

Log message:
        (Other Configuration Variables): edit

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1189&r2=1.1190
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.357&r2=1.358
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/htmlxref.cnf?cvsroot=texinfo&r1=1.39&r2=1.40

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1189
retrieving revision 1.1190
diff -u -b -r1.1189 -r1.1190
--- ChangeLog   4 Dec 2010 00:05:52 -0000       1.1189
+++ ChangeLog   9 Dec 2010 18:37:39 -0000       1.1190
@@ -1,3 +1,7 @@
+2010-12-09  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Other Configuration Variables): begin reading.
+
 2010-12-03  Karl Berry  <address@hidden>
 
        * makeinfo/tests/*: uniformly set LC_ALL, unset LANG, LANGUAGE,

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -b -r1.357 -r1.358
--- doc/texinfo.txi     3 Dec 2010 19:25:54 -0000       1.357
+++ doc/texinfo.txi     9 Dec 2010 18:37:40 -0000       1.358
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.357 2010/12/03 19:25:54 karl Exp $
address@hidden $Id: texinfo.txi,v 1.358 2010/12/09 18:37:40 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.
 
@@ -16725,47 +16725,62 @@
 
 @vtable @code
 @item DEBUG
-The integer value specifies what kind of debugging output is generated.
-It is a bitmask. Setting it to 255 ensures having all the debugging
-set.
+The integer value specifies what kinds of debugging output are
+generated.  It is a bitmask.  Setting it to 255 ensures having all
+available debugging output.
+
address@hidden DOCTYPE
address@hidden SystemLiteral
+For HTML, XML, Docbook.  Specifies the @code{SystemLiteral}, the
+entity's system identifier.  It is a URI, which may be used to
+retrieve the entity, and identifies the canonical DTD for the
+document.
+
address@hidden DUMP_TEXI
+For debugging.  If set, the result of the first pass is put in
address@hidden@var{docname}.passtexi}, and the result of the second pass is
+put in @address@hidden
+
 @item FRAMES
 For HTML. If set, a file describing the frame layout is generated, 
 together with a file with the short table of contents.
address@hidden DOCTYPE
-For HTML, XML, Docbook.
-The SystemLiteral, the entity's system identifier.  It is a URI, which 
-may be used to retrieve the entity, and it identifies the canonical DTD 
-for the document.
+
 @item FRAMESET_DOCTYPE
-For HTML.  Same as DOCTYPE, but for the file containing the frame description.
+For HTML.  Same as DOCTYPE, but for the file containing the frame
+description.
+
address@hidden SHOW_MENU
address@hidden --no-headers
+If set, the Texinfo menus are shown.  By default, it is only unset
+when generating Docbook or if @option{--no-headers} is specified.
+
 @item TEST
-If this value is true, some variables which should be dynamically generated
-(the date, the program name, the version) are set to fixed and given values. 
-This is usefull in case the resulting manual is compared with a reference. 
-For example this is used in the tests.
address@hidden DUMP_TEXI
-Mainly useful for debugging.  If set, the result of the first pass is
-put in @file{<document name>.passtexi}, the result of the second pass is 
-put in @file{<document name>.passfirst}.
address@hidden TOP_FILE
-This file name may be used for the top-level file.  The extension is set 
-appropriately, if necessary. This is used to override the default, and is, in
-general only taken into account when split.
+If set to true, some variables which are normally dynamically
+generated anew for each run (the date, the program name, the version)
+are set to fixed and given values.  This is useful to compare the
+output to a reference file, as is done for the tests.
+
 @item TOC_FILE
-This file name is used for the table of contents.  The extension is set 
-appropriately, if necessary.  It is only used if split and 
address@hidden is not set.  Default is @file{<document name>_toc.html}.
address@hidden SHOW_MENU
-If set, the Texinfo menus are shown.  It is set in all the formats, for 
-example it is set for HTML (except if @option{--no-headers} is used),
-Info and XML, but not for Docbook.
address@hidden INLINE_CONTENTS
+This file name is used for the table of contents.  The extension is
+set appropriately, if necessary.  It is only used if output is split
+and @code{INLINE_CONTENTS} is not set.  Default is
address@hidden@var{docname}_toc.html}.
+
address@hidden TOC_LINKS
+For HTML.  If set, links from headings to toc entries are created.
+
address@hidden TOP_FILE
+This file name may be used for the top-level file.  The extension is
+set appropriately, if necessary.  This is used to override the default,
+and is, in general, only taken into account when output is split.
+
 @item USE_NODES
-Use nodes preferentially to decide where elements are separated.
+Preferentially use nodes to decide where elements are separated.
+
 @item USE_SECTIONS
-Use sectioning @@-commands preferentially to decide where elements are 
-separated.
address@hidden TOC_LINKS
-For HTML. If set links from headings to toc entries are created.
+Preferentially use sectioning to decide where elements are separated.
+
 @item SHORTEXTN
 The default extension is set to @samp{.htm}.
 @item PREFIX
@@ -22982,7 +22997,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.357 2010/12/03 19:25:54 karl Exp $
+$Id: texinfo.txi,v 1.358 2010/12/09 18:37:40 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}
@@ -23061,7 +23076,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.357 2010/12/03 19:25:54 karl Exp $
address@hidden $Id: texinfo.txi,v 1.358 2010/12/09 18:37:40 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.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- util/htmlxref.cnf   3 Dec 2010 19:25:55 -0000       1.39
+++ util/htmlxref.cnf   9 Dec 2010 18:37:40 -0000       1.40
@@ -1,6 +1,6 @@
 # htmlxref.cnf - reference file for Texinfo files on the web.
 
-htmlxrefversion=2010-12-03.18; # UTC
+htmlxrefversion=2010-12-09.18; # UTC
 
 # Copyright 2010 Free Software Foundation, Inc.
 # 
@@ -430,11 +430,28 @@
 pspp           mono    ${GS}/pspp/manual/pspp.html
 pspp           node    ${GS}/pspp/manual/html_node/
 
+R = http://cran.r-project.org/doc/manuals/
+ R-intro       mono    ${R}/R-intro.html
+ R-lang                mono    ${R}/R-lang.html
+ R-exts                mono    ${R}/R-exts.html
+ R-data                mono    ${R}/R-data.html
+ R-admin       mono    ${R}/R-admin.html
+ R-ints                mono    ${R}/R-ints.html
+
 recode         mono    http://recode.progiciels-bpi.ca/manual/index.html
 
+reftex         mono    ${GS}/auctex/manual/reftex.html
+reftex         node    ${GS}/auctex/manual/reftex/
+
 rottlog                mono    ${GS}/rottlog/manual/rottlog.html
 rottlog                node    ${GS}/rottlog/manual/html_node/
 
+RUSH = http://www.gnu.org.ua/software/rush/manual
+rush           mono    ${RUSH}/rush.html
+rush           chapter ${RUSH}/html_chapter/
+rush           section ${RUSH}/html_section/
+rush           node    ${RUSH}/html_node/
+
 screen         mono    ${GS}/screen/manual/screen.html
 screen         node    ${GS}/screen/manual/html_node/
 
@@ -449,6 +466,9 @@
 sourceinstall  mono    ${GS}/sourceinstall/manual/sourceinstall.html
 sourceinstall  node    ${GS}/sourceinstall/manual/html_node/
 
+sqltutor       mono    ${GS}/sqltutor/manual/sqltutor.html
+sqltutor       node    ${GS}/sqltutor/manual/html_node/
+
 src-highlite   mono    ${GS}/src-highlite/source-highlight.html
 
 swbis          mono    ${GS}/swbis/manual.html
@@ -458,6 +478,9 @@
 tar            section ${GS}/tar/manual/html_section/
 tar            node    ${GS}/autoconf/manual/html_node/
 
+teseq          mono    ${GS}/teseq/teseq.html
+teseq          node    ${GS}/teseq/html_node/
+
 TEXINFO = ${GS}/texinfo/manual
 texinfo                mono    ${TEXINFO}/texinfo/texinfo.html
 texinfo                node    ${TEXINFO}/texinfo/html_node/