texinfo ChangeLog doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/08/14 23:59:36

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        merge flag value node into global information

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1106&r2=1.1107
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.288&r2=1.289

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1106
retrieving revision 1.1107
diff -u -b -r1.1106 -r1.1107
--- ChangeLog   13 Aug 2010 23:33:24 -0000      1.1106
+++ ChangeLog   14 Aug 2010 23:59:35 -0000      1.1107
@@ -1,3 +1,8 @@
+2010-08-14  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Init File Global Information): merge text
+       from Flag values node.
+
 2010-08-13  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (Init File Global Information): edit.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -b -r1.288 -r1.289
--- doc/texinfo.txi     13 Aug 2010 23:35:11 -0000      1.288
+++ doc/texinfo.txi     14 Aug 2010 23:59:35 -0000      1.289
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.288 2010/08/13 23:35:11 karl Exp $
address@hidden $Id: texinfo.txi,v 1.289 2010/08/14 23:59:35 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.
 
@@ -16311,7 +16311,7 @@
 
 If @var{file} is a directory or ends with a @samp{/} the usual rules
 are used to determine the actual output file name (use
address@hidden@@setfilename} or the input file name) but these files are are
address@hidden@@setfilename} or the input file name) but these files are
 written to the @var{file} directory.  For example, @samp{makeinfo -o
 bar/ foo.texi}, with or without @option{--no-split}, will write
 @file{bar/foo.info}, and possibly other files under @file{bar/}.
@@ -18641,8 +18641,7 @@
 * Init File Variables::  Configuration & other variables, function references.
 * Init File Namespaces:: @code{Texi2HTML::Config}, @code{Texi2HTML}, and 
@code{main}.
 * Setting and Getting Configuration Variables::
-* Init File Global Information::  Accessing the document title, etc.
-* Getting flag values::
+* Init File Global Information::  Accessing the document title, file name, etc.
 * Encodings::                 Setting the encodings.
 * Redefining functions::      Function redefinition is achieved with 
                               redefinition of references on functions.
@@ -18811,7 +18810,7 @@
 
 
 @node Init File Global Information
address@hidden Init File: Global Information
address@hidden Init File Global Information
 
 @cindex Init files, and global information
 @cindex Global information, in init files
@@ -18955,7 +18954,7 @@
 
 @end table
 
-Here are entries for various global document information:
+Here are entries for other global document information:
 
 @table @code
 @item copying_comment
@@ -18991,7 +18990,7 @@
 
 @end table
 
-Finally, here are index-related entries:
+Here are index-related entries:
 
 @table @code
 @item defindex 
@@ -19020,13 +19019,13 @@
 
 @end table
 
-
address@hidden Getting flag values
address@hidden Getting the values of flags set by @code{@@set}
-
-Flags defined by @code{@@set} may be accessed through the 
address@hidden::value} hash.  The key is the flag name, the value is the
-flag value. 
address@hidden Init file flag values
address@hidden Flag values, in init files
address@hidden @code{@@set} values, in init files
address@hidden %main::value
+Finally, flags defined with @code{@@set} (@pxref{set value})
+may be accessed through the @code{%main::value} hash.  The key is the
+flag name, and the value is the flag value.
 
 
 @node Encodings
@@ -24366,7 +24365,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.288 2010/08/13 23:35:11 karl Exp $
+$Id: texinfo.txi,v 1.289 2010/08/14 23:59:35 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}
@@ -24445,7 +24444,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.288 2010/08/13 23:35:11 karl Exp $
address@hidden $Id: texinfo.txi,v 1.289 2010/08/14 23:59:35 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi