Index: texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.484
diff -u -3 -p -r1.484 texinfo.txi
--- texinfo.txi	15 Sep 2012 16:00:56 -0000	1.484
+++ texinfo.txi	15 Sep 2012 17:38:15 -0000
@@ -17228,6 +17228,7 @@ variable with the same name (minus the l
 @smallexample
 @@allowcodebreaks @@clickstyle @@codequotebacktick 
 @@codequoteundirected @@contents @@deftypefnnewline
+@@documentdescription
 @@documentencoding @@documentlanguage
 @@evenfootingmarks @@evenheadingmarks @@everyfootingmarks 
 @@everyheadingmarks @@exampleindent @@firstparagraphindent
@@ -17235,13 +17236,18 @@ variable with the same name (minus the l
 @@kbdinputstyle @@novalidate @@oddfootingmarks
 @@oddheadingmarks @@pagesizes @@paragraphindent
 @@setchapternewpage @@setcontentsaftertitlepage
+@@setfilename
 @@setshortcontentsaftertitlepage @@shortcontents
 @@urefbreakstyle @@xrefautomaticsectiontitle
 @end smallexample
address@hidden @@setfilename
 
 Setting such a customization variable to a value @samp{foo} is
-essentially the same as executing @code{@@@var{cmd} foo}.
+similar with executing @code{@@@var{cmd} foo}.  It is not 
+exactly the same, though, since any side-effect achieved when
+parsing the Texinfo manual is not redone.  Also some formats
+for some commands do not expect Texinfo code, but an argument
+that is already formatted.  This is the case, for example, 
+for HTML for @code{documentdescription}.
 
 
 @node Customization Variables and Options
@@ -17292,10 +17298,14 @@ texi2any}, for the meaning of the option
                                         @code{SUBDIR}
 @vindex paragraphindent
 @item @option{--paragraph-indent}  @tab @code{paragraphindent}
address@hidden SILENT
address@hidden @option{--silent}            @tab @code{SILENT}
 @vindex SPLIT
 @item @option{--split}             @tab @code{SPLIT}
 @vindex SPLIT_SIZE
 @item @option{--split-size}        @tab @code{SPLIT_SIZE}
address@hidden TRANSLITERATE_FILE_NAMES
address@hidden @option{--transliterate-file-names} @tab @code{TRANSLITERATE_FILE_NAMES}
 @vindex VERBOSE
 @item @option{--verbose}           @tab @code{VERBOSE}
 @end multitable
@@ -17393,11 +17403,6 @@ For address@hidden  If this is set a @code{<tabl
 For address@hidden  Rule used between element, except after and before the 
 top element, or before special elements, and for footers and headers.
 
address@hidden not used for now
address@hidden @item DEFAULT_ENCODING
address@hidden The default output file encoding.  Currently @samp{utf8} or
address@hidden @samp{ascii} for Info.
-
 @item DO_ABOUT
 If set to 0 never do an About special element.
 If set to 1 always do an About special element. @c @xref{Output Elements Defined}.
@@ -17423,11 +17428,6 @@ For HTML, address@hidden  If @option{--enable-enc
 entity corresponding with the letter or the symbol being output,
 prefer the entity.
 
address@hidden @item ENCODING_NAME
address@hidden Output document encoding name. By default, it is set automatically
address@hidden based on @code{@@documentencoding}.  This encoding name is the
address@hidden classical charset name in HTML.
-
 @item EXTERNAL_CROSSREF_SPLIT
 For cross references to other manuals, this determines if the other
 manual is considered to be split or monolithic.  By default, it is set
@@ -17498,9 +17498,6 @@ links.
 @item INDEX_ENTRY_COLON
 Symbol used between the index entry and the associated node or section.
 
address@hidden @item IN_ENCODING
address@hidden Set the input file encoding (@pxref{documentencoding,,
address@hidden @code{@@documentencoding}}) using Perl encoding names.
 
 @item INLINE_CONTENTS
 If set, output the contents where the @code{@@contents} and similar
@@ -17516,6 +17513,19 @@ If set, @code{@@insertcopying} is replac
 content (@pxref{copying,, @code{@@copying}}) as if
 @code{@@insertcopying} were a user-defined macro.
 
address@hidden INPUT_ENCODING_NAME
+Normalized encoding name suitable for output.  Should
+correspond with classical charset name in HTML, typically 
+preferred IANA encoding names.  
+You should
+not need to use that variable, since it is set by 
address@hidden@@documentencoding}.  @xref{documentencoding}.
+
address@hidden INPUT_PERL_ENCODING
+Perl encoding name used for the input Texinfo manual.  You should
+not need to use that variable, since it is set by 
address@hidden@@documentencoding}.  @xref{documentencoding}.
+
 @item KEEP_TOP_EXTERNAL_REF
 For address@hidden  If set, do not ignore @samp{Top} as the first 
 argument for an external ref to a manual, as is done by default.
@@ -17597,9 +17607,25 @@ If set, use node names in menu entries, 
 @item OPEN_QUOTE_SYMBOL
 When an opening quote is needed, use the corresponding character.
 
address@hidden OUT_ENCODING
-Output files encoding using the Perl encoding name.  By default,
-this is set automatically based on @code{@@documentencoding}.
address@hidden OUTPUT_PERL_ENCODING
+Perl encoding name used for the output files. By default,
+this is set automatically based on @code{@@documentencoding} or
address@hidden  You should never need to set this
+customization variable, instead, you should set 
address@hidden
+
address@hidden OUTPUT_ENCODING_NAME
+Normalized encoding name used for output.  Should 
+correspond with classical charset name in HTML, typically 
+preferred IANA encoding names.  
+
+In the default case, if an input encoding is set, typically through 
address@hidden@@documentencoding} or @code{INPUT_ENCODING_NAME},
+this information is used to set the output encoding name.
+If no input encoding is specified, the default output encoding 
+name may be set by the output format.  This is the case 
+for XML-based formats, for example, that use a @code{utf-8} 
address@hidden
 
 @item OVERVIEW_LINK_TO_TOC
 If set, the cross references in the Overview link to the corresponding
@@ -17717,6 +17743,9 @@ for address@hidden
 @item TOP_NODE_UP
 Up node for the Top node; default @samp{(dir)}.
 
address@hidden TOP_NODE_UP_URL
+Url used for the up node of the Top node for HTML; default @code{undef}.
+
 @item TOP_NODE_FILE
 File used for the Top node, if @code{NODE_FILENAMES} is set.