texinfo ChangeLog doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/08/13 00:21:03

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        doc loading order

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1104&r2=1.1105
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.285&r2=1.286

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1104
retrieving revision 1.1105
diff -u -b -r1.1104 -r1.1105
--- ChangeLog   12 Aug 2010 23:17:04 -0000      1.1104
+++ ChangeLog   13 Aug 2010 00:21:02 -0000      1.1105
@@ -1,3 +1,8 @@
+2010-08-12  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Loading Init Files),
+       (HTML Xref Configuration): change doc of loading order.
+
 2010-08-13  Patrice Dumas  <address@hidden>
 
        * texi2html/texi2html.pl (close_stack): more precise error

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -b -r1.285 -r1.286
--- doc/texinfo.txi     12 Aug 2010 23:07:29 -0000      1.285
+++ doc/texinfo.txi     13 Aug 2010 00:21:02 -0000      1.286
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.285 2010/08/12 23:07:29 pertusus Exp $
address@hidden $Id: texinfo.txi,v 1.286 2010/08/13 00:21:02 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.
 
@@ -18378,10 +18378,10 @@
 (likewise specified at compile time, e.g., @file{/usr/local/share})
 @end table
 
-The first file found is used.  The Texinfo distribution includes a
-default file which handles many GNU manuals; it is installed in the
-last of the above directories, i.e.,
address@hidden@var{datadir}/texinfo/htmlxref.cnf}.
+All files found are used, with earlier entries overriding later ones.
+The Texinfo distribution includes a default file which handles many
+GNU manuals; it is installed in the last of the above directories,
+i.e., @address@hidden/texinfo/htmlxref.cnf}.
 
 The file is line-oriented.  Lines consisting only of whitespace are
 ignored.  Comments are indicated with a @samp{#} at the beginning of a
@@ -18555,32 +18555,34 @@
 
 @pindex Config @r{init files loaded}
 
-It is possible to load so-called @dfn{initialization files}, or
address@hidden files} for short, to modify almost every aspect of output
-formatting.  The program loads init files named @file{Config} each
-time it is run.  Those files are looked for in the following
-directories (where @var{prog} is the name of the program invoked on
-the command line, normally @code{makeinfo} or @code{texi2any}):
+You can write so-called @dfn{initialization files}, or @dfn{init
+files} for short, to modify almost every aspect of output formatting.
+The program loads init files named @file{Config} each time it is run.
+Those files are looked for in the following directories (where
address@hidden is the name of the program invoked on the command line,
+normally @code{makeinfo} or @code{texi2any}):
 
 @table @file
address@hidden ./
-(the current directory)
address@hidden @var{datadir}/@var{prog}/
+(likewise specified at compile time, e.g., @file{/usr/local/share})
 
address@hidden ./address@hidden/
-(under the current directory)
address@hidden @var{sysconfdir}/@var{prog}/
+(where @var{sysconfdir} is the system configuration directory
+specified at compile-time, e.g., @file{/usr/local/etc})
 
 @item ~/address@hidden/
 (where @code{~} is the current user's home directory)
 
address@hidden @var{sysconfdir}/@var{prog}/
-(where @var{sysconfdir} is the system configuration directory
-specified at compile-time, e.g., @file{/usr/local/etc})
address@hidden ./address@hidden/
+(under the current directory)
 
address@hidden @var{datadir}/@var{prog}/
-(likewise specified at compile time, e.g., @file{/usr/local/share})
address@hidden ./
+(the current directory)
 @end table
 
-All @file{Config} files found are used, in the above order. 
+All @file{Config} files found are loaded, in the above order.  Thus,
address@hidden/Config} can override entries in, say,
address@hidden/usr/local/share/makeinfo/Config}.
 
 @opindex --init-file
 However, the most common way to load an initialization file is with
@@ -18588,7 +18590,7 @@
 loaded.  By default the following directories are searched, in the
 following order, where @var{prog} is the name of the program invoked
 on the command line (@command{makeinfo}, @command{texi2any}, etc.).
-The first file found is used:
+Only the first file found is used:
 
 @enumerate
 @item The current directory @file{./};
@@ -18596,14 +18598,15 @@
 @item @file{./address@hidden/} under the current directory;
 
 @item @file{~/address@hidden/}
-(where @code{~} is the current user's home directory)
+where @code{~} is the current user's home directory;
 
 @item @address@hidden/@var{prog}/}
-(where @var{sysconfdir} is the system configuration directory
-specified at compile-time, e.g., @file{/usr/local/etc})
+where @var{sysconfdir} is the system configuration directory
+specified at compile-time, e.g., @file{/usr/local/etc};
 
 @item @address@hidden/@var{prog}/}
-(likewise specified at compile time, e.g., @file{/usr/local/share})
+Where @var{datadir} is the system data directory likewise specified at
+compile time, e.g., @file{/usr/local/share};
 
 @item @file{./.texinfo/init/} under the current directory;
 
@@ -18612,11 +18615,10 @@
 @item @address@hidden/texinfo/init/} with @var{sysconfdir} as above;
 
 @item @address@hidden/texinfo/init/} with @var{datadir} as above.
-
 @end enumerate
 
 Additional directories may be prepended to the list with the
address@hidden option.
address@hidden option (@pxref{Invoking texi2any}).
 
 
 @node Init File Basics
@@ -18810,17 +18812,17 @@
 @node Init File Global Information
 @subsection Init File: Global Information
 
address@hidden
-FIXME those are still undocumented
-'split_level' 
-'variable_levels' 'variables'
-do_about
-'FH' 'state' 'format_from_command_line'
-command_stack
-line_nr
-%htmlxref
-%hyphenation
address@hidden ignore
address@hidden @ignore
address@hidden FIXME those are still undocumented
address@hidden 'split_level' 
address@hidden 'variable_levels' 'variables'
address@hidden do_about
address@hidden 'FH' 'state' 'format_from_command_line'
address@hidden command_stack
address@hidden line_nr
address@hidden %htmlxref
address@hidden %hyphenation
address@hidden @end ignore
 
 For title related @@-commands, like @code{@@title}, @code{@@titlefont},
 @code{@@author}, @code{@@top} some information is available, with diverse 
@@ -24315,7 +24317,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.285 2010/08/12 23:07:29 pertusus Exp $
+$Id: texinfo.txi,v 1.286 2010/08/13 00:21:02 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}
@@ -24394,7 +24396,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.285 2010/08/12 23:07:29 pertusus Exp $
address@hidden $Id: texinfo.txi,v 1.286 2010/08/13 00:21:02 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi