texinfo ChangeLog doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/07/22 00:39:49

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        reformat --conf-dir text

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1065&r2=1.1066
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.260&r2=1.261

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1065
retrieving revision 1.1066
diff -u -b -r1.1065 -r1.1066
--- ChangeLog   20 Jul 2010 07:26:29 -0000      1.1065
+++ ChangeLog   22 Jul 2010 00:39:49 -0000      1.1066
@@ -1,3 +1,7 @@
+2010-07-21  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Invoking texi2any) <--conf-dir>: reformat.
+
 2010-07-19  Patrice Dumas  <address@hidden>
 
        * texi2html/test/sectionning: rename to sectioning.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -b -r1.260 -r1.261
--- doc/texinfo.txi     19 Jul 2010 23:48:17 -0000      1.260
+++ doc/texinfo.txi     22 Jul 2010 00:39:49 -0000      1.261
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.260 2010/07/19 23:48:17 pertusus Exp $
address@hidden $Id: texinfo.txi,v 1.261 2010/07/22 00:39:49 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.
 
@@ -2908,12 +2908,15 @@
 @cindex Texinfo requires @code{@@setfilename}
 
 In order to serve as the primary input file for either @code{makeinfo}
-or @TeX{}, a Texinfo file must contain a line that looks like this:
+or @TeX{}, a Texinfo file should contain a line that looks like this:
 
 @example
 @@setfilename @var{info-file-name}
 @end example
 
+It is required for @TeX{}, and very strongly recommended for
address@hidden
+
 Write the @code{@@setfilename} command at the beginning of a line and
 follow it on the same line by the Info file name.  Do not write anything
 else on the line; anything on the line after the command is considered
@@ -2954,13 +2957,6 @@
 with @samp{html}, or add @samp{.html} if the given name has no
 extension.
 
-If there is no @code{@@setfilename}, the output file to be generated
-is based on the input file name. First any extension 
-in @code{.texi}, @code{.tex}, @code{.txi} or @code{.texinfo} is removed 
-from the input file and then the output format specific extension is 
-added (@code{.html} when generating HTML, @code{.info} when generating
-Info, @enddots{}).
-
 @pindex texinfo.cnf
 The @code{@@setfilename} line produces no output when you typeset a
 manual with @TeX{}, but it is nevertheless essential: it opens the
@@ -2968,6 +2964,13 @@
 also reads @file{texinfo.cnf} if that file is present on your system
 (@pxref{Preparing for TeX,, Preparing for @TeX{}}).
 
+If there is no @code{@@setfilename} line, @code{makeinfo} (but not
address@hidden) uses the input file name to determine the output name: first,
+any of the extensions @code{.texi}, @code{.tex}, @code{.txi} or
address@hidden is removed from the input file name; then, the
+output format specific extension is address@hidden when
+generating HTML, @code{.info} when generating Info, @enddots{}
+
 
 @node settitle
 @subsection @code{@@settitle}: Set the document title
@@ -5187,9 +5190,6 @@
 unnumberedsec appendixsec heading
 @end smallexample
 
-If you really want a comma in a node name, you can use 
@code{@@address@hidden@}}.
address@hidden a Comma}.
-
 @cindex Case in node name
 @item
 Case is significant in node names.
@@ -16005,30 +16005,40 @@
 done by default, though @@-commands in node names are still not officially
 part of the Texinfo language.
 
address@hidden address@hidden
address@hidden address@hidden
-Append @var{dir} to the directory search list for finding customization
-files that may be loaded with @option{--init-file}. By default the following 
-directories are searched, in that order (with @var{program_name} the 
-name of the program invoked on the command line):
address@hidden address@hidden
address@hidden address@hidden
+Append @var{path} to the directory search list for finding
+customization files that may be loaded with @option{--init-file} (see
+below).  By default the following directories are searched, in this
+order (where @var{prog} is the name of the program invoked on the
+command line):
 
 @enumerate
 @item The current directory @file{.};
address@hidden @file{$HOME/.program_name} where @env{$HOME} is the user home 
directory;
address@hidden @file{sysconfdir/program_name} where @file{sysconfdir} is the 
directory
-for local configuration, determined at build time;
address@hidden @file{datadir/program_name} where @file{datadir} is the directory
-for data, determined at build time;
+
address@hidden @file{$HOME/address@hidden, where @env{$HOME} is the user home 
directory;
+
address@hidden @address@hidden/@var{prog}}, where @var{sysconfdir} is
+the system directory for host-specific configuration, determined at
+build time (@code{/usr/local/etc} by default);
+
address@hidden @address@hidden/@var{prog}} where @var{datadir} is the
+system directory for data files, determined at build time
+(@code{/usr/local/share} by default);
+
 @item the directory @file{.texinfo/init} in the current directory;
+
 @item @file{$HOME/.texinfo/init} where @env{$HOME} is the user home directory;
address@hidden @file{sysconfdir/texinfo/init} with  @file{sysconfdir} as above;
address@hidden @file{datadir/texinfo/init} with  @file{datadir} as above.
+
address@hidden @address@hidden/texinfo/init} with @var{sysconfdir} as above;
+
address@hidden @address@hidden/texinfo/init} with @var{datadir} as above.
+
 @end enumerate
 
-Note that
address@hidden can actually be a list of several directories separated by the
-usual path separator character (@samp{:} on Unix, @samp{;} on
-MS-DOS/MS-Windows).
address@hidden can be a single directory, or a list of several directories
+separated by the usual path separator character (@samp{:} on GNU and
+Unix systems, @samp{;} on MS-DOS/MS-Windows).
 
 @item address@hidden
 @opindex --css-include
@@ -20331,7 +20341,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.260 2010/07/19 23:48:17 pertusus Exp $
+$Id: texinfo.txi,v 1.261 2010/07/22 00:39:49 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}
@@ -20410,7 +20420,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.260 2010/07/19 23:48:17 pertusus Exp $
address@hidden $Id: texinfo.txi,v 1.261 2010/07/22 00:39:49 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi