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

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/12/03 19:25:55

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

Log message:
        (Configuration Variables {and Options,for @@-Commands}): rename+edit

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1186&r2=1.1187
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.356&r2=1.357
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/htmlxref.cnf?cvsroot=texinfo&r1=1.38&r2=1.39

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1186
retrieving revision 1.1187
diff -u -b -r1.1186 -r1.1187
--- ChangeLog   2 Dec 2010 17:38:11 -0000       1.1186
+++ ChangeLog   3 Dec 2010 19:25:54 -0000       1.1187
@@ -1,3 +1,14 @@
+2010-12-03  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Configuration Variables and Options),
+       (Configuration Variables for @@-Commands): rename+edit.
+
+2010-12-02  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (texi2any Configuration Variables): rather than
+       makeinfo, I guess.
+       (Other Configuration Variables): Split off into new node.
+
 2010-12-01  Patrice Dumas  <address@hidden>
 
        * texi2html/texi2html.pl: don't warn when a user-defined macro

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -b -r1.356 -r1.357
--- doc/texinfo.txi     2 Dec 2010 17:52:54 -0000       1.356
+++ doc/texinfo.txi     3 Dec 2010 19:25:54 -0000       1.357
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.356 2010/12/02 17:52:54 karl Exp $
address@hidden $Id: texinfo.txi,v 1.357 2010/12/03 19:25:54 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.
 
@@ -16603,8 +16603,8 @@
 @end cartouche
 
 Many aspects of the behavior and output of @command{texi2any} may be
-modified by modifying configuration variables.  These @dfn{configuration
-variables} fall into three general categories:
+modified by modifying configuration variables.  These
address@hidden variables} fall into three general categories:
 
 @itemize @bullet
 @item those associated with @@-commands in the document,
@@ -16632,54 +16632,93 @@
 * Other:    Other Configuration Variables.
 @end menu
 
+
 @node Configuration Variables for @@-Commands
address@hidden Configuration variables for @@-Commands
address@hidden Configuration Variables for @@-Commands
 
-Configuration variables with the same name than @@-commands are associated
-with the following @@-commands:
address@hidden Configuration variables for @@-commands
address@hidden @@-commands, configuration variables for
 
address@hidden
-@@everyheading @@everyfooting @@evenheading @@evenfooting @@oddheading 
-@@oddfooting @@headings @@allowcodebreaks @@frenchspacing @@exampleindent
-@@firstparagraphindent @@paragraphindent @@clickstyle @@documentlanguage 
-@@contents @@shortcontents @@setcontentsaftertitlepage 
-@@setshortcontentsaftertitlepage @@footnotestyle @@novalidate 
-@@kbdinputstyle @@documentencoding @@setfilename @@today 
-@@documentdescription @@everyheadingmarks @@everyfootingmarks 
-@@evenheadingmarks @@oddheadingmarks @@evenfootingmarks @@oddfootingmarks 
-@@fonttextsize @@pagesizes @@setchapternewpage
address@hidden example
+Each of the following @@-commands has an associated configuration
+variable with the same name (minus the leading @code{@@}):
+
address@hidden
+@@allowcodebreaks @@clickstyle @@contents @@documentdescription
+@@documentencoding @@documentlanguage @@evenfooting
+@@evenfootingmarks @@evenheading @@evenheadingmarks
+@@everyfooting @@everyfootingmarks @@everyheading
+@@everyheadingmarks @@exampleindent @@firstparagraphindent
+@@fonttextsize @@footnotestyle @@frenchspacing @@headings
+@@kbdinputstyle @@novalidate @@oddfooting @@oddfootingmarks
+@@oddheading @@oddheadingmarks @@pagesizes @@paragraphindent
+@@setchapternewpage @@setcontentsaftertitlepage @@setfilename
+@@setshortcontentsaftertitlepage @@shortcontents @@today
address@hidden smallexample
+
+Setting such a configuration variable to a value @samp{foo} is
+essentially the same as executing @code{@@@var{cmd} foo}.
 
 
 @node Configuration Variables and Options
 @subsection Configuration Variables and Options
 
-The following table describes the association of command-line options and
-variables. For the meaning of the options, @ref{Invoking texi2any}.
address@hidden Configuration variables for options
address@hidden Options, configuration variables for
+
+The following table gives the configuration variables associated
+with some command line options.  @xref{Invoking
+texi2any}, for the meaning of the options.
 
 @multitable @columnfractions 0.5 0.5
address@hidden option @tab variable
address@hidden Option @tab Variable
address@hidden ENABLE_ENCODING
 @item @option{--enable-encoding} @tab @code{ENABLE_ENCODING}
address@hidden documentlanguage
 @item @option{--document-language} @tab @code{documentlanguage}
address@hidden ERROR_LIMIT
 @item @option{--error-limit} @tab @code{ERROR_LIMIT}
address@hidden FILLCOLUMN
 @item @option{--fill-column} @tab @code{FILLCOLUMN}
address@hidden footnotestyle
 @item @option{--footnote-style} @tab @code{footnotestyle}
address@hidden FORCE
 @item @option{--force} @tab @code{FORCE}
address@hidden INTERNAL_LINKS
 @item @option{--internal-links} @tab @code{INTERNAL_LINKS}
address@hidden MACRO_EXPAND
 @item @option{--macro-expand} @tab @code{MACRO_EXPAND}
address@hidden @option{--headers} @tab @code{HEADERS} and @code{SHOW_MENU}
address@hidden HEADERS
address@hidden SHOW_MENU
address@hidden @option{--headers}           @tab @code{HEADERS}, 
@code{SHOW_MENU}
address@hidden NO_WARN
 @item @option{--no-warn} @tab @code{NO_WARN}
address@hidden novalidate
 @item @option{--no-validate} @tab @code{novalidate}
address@hidden NUMBER_FOOTNOTES
 @item @option{--number-footnotes} @tab @code{NUMBER_FOOTNOTES}
address@hidden NUMBER_SECTIONS
 @item @option{--number-sections} @tab @code{NUMBER_SECTIONS}
address@hidden NODE_FILES
 @item @option{--node-files} @tab @code{NODE_FILES}
address@hidden @option{--output} @tab @code{OUT}, @code{OUTFILE} and 
@code{SUBDIR}
address@hidden OUT
address@hidden OUTFILE
address@hidden SUBDIR
address@hidden @option{--output}            @tab @code{OUT}, @code{OUTFILE},
+                                        @code{SUBDIR}
address@hidden paragraphindent
 @item @option{--paragraph-indent} @tab @code{paragraphindent}
address@hidden SPLIT
 @item @option{--split} @tab @code{SPLIT}
address@hidden SPLIT_SIZE
 @item @option{--split-size} @tab @code{SPLIT_SIZE}
address@hidden VERBOSE
 @item @option{--verbose} @tab @code{VERBOSE}
 @end multitable
 
+Setting such a configuration variable to a value @samp{foo} is
+essentially the same as specifying the @address@hidden if the
+option takes an argument, or @address@hidden if not.
+
 
 @node Other Configuration Variables
 @subsection Other Configuration Variables
@@ -19697,7 +19736,7 @@
 element.  Either the node or the sectioning command is considered to
 be the main element component, depending on the values of the
 configuration variables @code{USE_NODES} and @code{USE_SECTIONS}
-(@address@hidden Configuration Variables}).
+(@address@hidden Configuration Variables}).
 
 For example, when generating Info, the nodes are the elements; when
 generating Docbook, sectioning commands are the main element
@@ -22943,7 +22982,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.356 2010/12/02 17:52:54 karl Exp $
+$Id: texinfo.txi,v 1.357 2010/12/03 19:25:54 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}
@@ -23022,7 +23061,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.356 2010/12/02 17:52:54 karl Exp $
address@hidden $Id: texinfo.txi,v 1.357 2010/12/03 19:25:54 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.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- util/htmlxref.cnf   2 Dec 2010 17:52:54 -0000       1.38
+++ util/htmlxref.cnf   3 Dec 2010 19:25:55 -0000       1.39
@@ -1,6 +1,6 @@
 # htmlxref.cnf - reference file for Texinfo files on the web.
 
-htmlxrefversion=2010-11-30.18; # UTC
+htmlxrefversion=2010-12-03.18; # UTC
 
 # Copyright 2010 Free Software Foundation, Inc.
 # 
@@ -418,6 +418,15 @@
 
 # can't use pcb since url's contain dates --30nov10
 
+PIES = http://www.gnu.org.ua/software/pies/manual
+pies           mono    ${PIES}/pies.html
+pies           chapter ${PIES}/html_chapter/
+pies           section ${PIES}/html_section/
+pies           node    ${PIES}/html_node/
+
+proxyknife     mono    ${GS}/proxyknife/manual/proxyknife.html
+proxyknife     node    ${GS}/proxyknife/manual/html_node/
+
 pspp           mono    ${GS}/pspp/manual/pspp.html
 pspp           node    ${GS}/pspp/manual/html_node/