texinfo ChangeLog doc/texinfo.txi

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     13/01/14 00:36:33

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        (deffnx, documentencoding): @ in node names

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1513&r2=1.1514
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.520&r2=1.521

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1513
retrieving revision 1.1514
diff -u -b -r1.1513 -r1.1514
--- ChangeLog   13 Jan 2013 23:23:16 -0000      1.1513
+++ ChangeLog   14 Jan 2013 00:36:32 -0000      1.1514
@@ -1,7 +1,7 @@
 2013-01-13  Karl Berry  <address@hidden>
 
-       * doc/texinfo.txi (Special Insertions, Breaks): node names with @,
-       restructure.
+       * doc/texinfo.txi (Special Insertions, Breaks, deffnx,
+       documentencoding): node names with @, restructure.
 
        * po_document/LINGUAS (ja, es.us-ascii): remove.
        * tp/maintain/regenerate_docstr.sh: shorten name of

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -b -r1.520 -r1.521
--- doc/texinfo.txi     13 Jan 2013 23:23:16 -0000      1.520
+++ doc/texinfo.txi     14 Jan 2013 00:36:33 -0000      1.521
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.520 2013/01/13 23:23:16 karl Exp $
address@hidden $Id: texinfo.txi,v 1.521 2013/01/14 00:36:33 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.
 
@@ -505,7 +505,7 @@
 * Def Cmd Template::            Writing descriptions using definition commands.
 * Def Cmd Continuation Lines::  Continuing the heading over source lines.
 * Optional Arguments::          Handling optional and repeated arguments.
-* deffnx::                      Group two or more `first' lines.
+* @code{@@deffnx}::                     Group two or more `first' lines.
 * Def Cmds in Detail::          Reference for all the definition commands.
 * Def Cmd Conventions::         Conventions for writing definitions.
 * Sample Function Definition::  An example.
@@ -527,7 +527,7 @@
 Internationalization
 
 * @code{@@documentlanguage}::            Declaring the current language.
-* documentencoding::            Declaring the input encoding.
+* @code{@@documentencoding}::          Declaring the input encoding.
 
 Conditionally Visible Text
 
@@ -11068,9 +11068,8 @@
 To get the true accented characters output in Info, not just the ASCII
 transliterations, it is necessary to specify @code{@@documentencoding}
 with an encoding which supports the required characters
-(@pxref{documentencoding,,@code{@@documentencoding}}).  In this case,
-you can also use non-ASCII (e.g., pre-accented) characters in the
-source file.
+(@address@hidden@@documentencoding}}).  In this case, you can also use
+non-ASCII (e.g., pre-accented) characters in the source file.
 
 @findex " @r{(umlaut accent)}
 @cindex Umlaut accent
@@ -11238,9 +11237,9 @@
 @cindex Latin 1
 In order to get the symbols for the quotation marks in encoded Info
 output, it is necessary to specify @code{@@documentencoding UTF-8}.
-(@xref{documentencoding,,@code{@@documentencoding}}.)  Double
-guillemets are also present in ISO 8859-1 (aka address@hidden) and ISO
-8859-15 (aka address@hidden).
+(@address@hidden@@documentencoding}}.)  Double guillemets are also
+present in ISO 8859-1 (aka address@hidden) and ISO 8859-15 (aka
address@hidden).
 
 @cindex European Computer Modern fonts
 @cindex EC fonts
@@ -11576,10 +11575,9 @@
 @cindex Latin 9, and Euro
 In order to get the Euro symbol in encoded Info output, for example,
 it is necessary to specify @code{@@documentencoding ISO-8859-15} or
address@hidden@@documentencoding UTF-8}
-(@xref{documentencoding,,@code{@@documentencoding}}.)  The Euro symbol
-is in ISO 8859-15 (aka address@hidden), and is @emph{not} in the more
-widely-used ISO 8859-1 (address@hidden).
address@hidden@@documentencoding UTF-8} (@address@hidden@@documentencoding}}.)
+The Euro symbol is in ISO 8859-15 (aka address@hidden), and is
address@hidden in the more widely-used ISO 8859-1 (address@hidden).
 
 @pindex feymr10
 @cindex Euro font
@@ -12496,7 +12494,7 @@
 * Def Cmd Template::            Writing descriptions using definition commands.
 * Def Cmd Continuation Lines::  Continuing the heading over source lines.
 * Optional Arguments::          Handling optional and repeated arguments.
-* deffnx::                      Group two or more `first' lines.
+* @code{@@deffnx}::                     Group two or more `first' lines.
 * Def Cmds in Detail::          Reference for all the definition commands.
 * Def Cmd Conventions::         Conventions for writing definitions.
 * Sample Function Definition::  An example.
@@ -12700,18 +12698,20 @@
 @samp{foobar}.
 
 
address@hidden deffnx
address@hidden Two or More `First' Lines
address@hidden @code{@@deffnx}
address@hidden @code{@@deffnx}, et al.: Two or More `First' Lines
+
address@hidden@c old node
address@hidden deffnx
 @cindex Two `First' Lines for @code{@@deffn}
 @cindex Grouping two definitions together
 @cindex Definitions grouped together
address@hidden deffnx
 
 To create two or more `first' or header lines for a definition, follow
-the first @code{@@deffn} line by a line beginning with @code{@@deffnx}.
-The @code{@@deffnx} command works exactly like @code{@@deffn}
-except that it does not generate extra vertical white space between it
-and the preceding line.
+the first @code{@@deffn} line by a line beginning with
address@hidden@@deffnx}.  The @code{@@deffnx} command works exactly like
address@hidden@@deffn} except that it does not generate extra vertical white
+space between it and the preceding line.
 
 @need 1000
 For example,
@@ -13321,6 +13321,7 @@
 
 @end table
 
+
 @node Object-Oriented Methods
 @subsubsection Object-Oriented Methods
 
@@ -13562,7 +13563,7 @@
 
 @menu
 * @code{@@documentlanguage}::            Declaring the current language.
-* documentencoding::            Declaring the input encoding.
+* @code{@@documentencoding}::          Declaring the input encoding.
 @end menu
 
 
@@ -13644,9 +13645,10 @@
 @url{http://en.wikipedia.org/wiki/ISO_3166}.
 
 
address@hidden documentencoding
address@hidden @code{@@documentencoding}
 @section @code{@@documentencoding @var{enc}}: Set Input Encoding
 
address@hidden@c old name
 @findex documentencoding
 @cindex Encoding, declaring
 @cindex Input encoding, declaring
@@ -15873,8 +15875,8 @@
 allow conversion of an input document before running @TeX{}. The
 @option{--recode} option recodes the document from encoding specified
 by @samp{@@documentencoding} command
-(@pxref{documentencoding,,@code{documentencoding}}) to plain 7-bit
address@hidden encoding.
+(@address@hidden@@documentencoding}}) to plain 7-bit @samp{texinfo}
+encoding.
 
 @opindex address@hidden, for @command{texi2dvi}}
 The option @address@hidden recodes the document from
@@ -16822,9 +16824,8 @@
 By default, or with @option{--enable-encoding}, output accented and
 special characters in Info and plain text output based on
 @samp{@@documentencoding}.  With @option{--disable-encoding}, 7-bit
-ASCII transliterations are output.
address@hidden,,@code{documentencoding}}, and @ref{Inserting
-Accents}.
+ASCII transliterations are output.  @address@hidden@@documentencoding}},
+and @ref{Inserting Accents}.
 
 @item --docbook
 @opindex --docbook
@@ -17749,12 +17750,12 @@
 Normalized encoding name suitable for output.  Should be a usable
 charset name in HTML, typically one of the preferred IANA encoding
 names.  You should not need to use this variable, since it is set by
address@hidden@@documentencoding} (@pxref{documentencoding}).
address@hidden@@documentencoding} (@address@hidden@@documentencoding}}).
 
 @item INPUT_PERL_ENCODING
 Perl encoding used to process the Texinfo source.  You should not need
 to use that variable, since it is set by @code{@@documentencoding}
-(@pxref{documentencoding}).
+(@address@hidden@@documentencoding}}).
 
 @item KEEP_TOP_EXTERNAL_REF
 For address@hidden  If set, do not ignore @samp{Top} as the first 
@@ -17856,7 +17857,7 @@
 encoding is specified, the default output encoding name may be set by
 the output format.  In particular, the XML-based formats use
 @code{utf-8} for @code{OUTPUT_ENCODING_NAME} if the encoding is not
-otherwise specified.  @xref{documentencoding,, @code{@@documentencoding}}.
+otherwise specified.  @address@hidden@@documentencoding}}.
 
 @item OVERVIEW_LINK_TO_TOC
 If set, the cross references in the Overview link to the corresponding
@@ -20248,7 +20249,7 @@
 Format a description for a variable associated with a class in
 object-oriented programming.  Takes three arguments: the category of
 thing being defined, the class to which it belongs, and its name.
address@hidden Commands}, and @ref{deffnx,, Def Cmds in Detail}.
address@hidden Commands}.
 
 @item @@deffn @var{category} @var{name} @address@hidden
 @itemx @@deffnx @var{category} @var{name} @address@hidden
@@ -20270,20 +20271,18 @@
 @itemx @@defivarx @var{class} @var{instance-variable-name}
 Format a description for an instance variable in object-oriented
 programming.  The command is equivalent to @samp{@@defcv @{Instance
address@hidden @dots{}}.  @xref{Definition Commands}, and @ref{deffnx,,
-Def Cmds in Detail}.
address@hidden @dots{}}.  @xref{Definition Commands}.
 
 @item @@defmac @var{macroname} @address@hidden
 @itemx @@defmacx @var{macroname} @address@hidden
 Format a description for a macro; equivalent to @samp{@@deffn Macro
address@hidden  @xref{Definition Commands}, and @ref{deffnx,, Def Cmds in
-Detail}.
address@hidden  @xref{Definition Commands}.
 
 @item @@defmethod @var{class} @var{method-name} @address@hidden
 @itemx @@defmethodx @var{class} @var{method-name} @address@hidden
 Format a description for a method in object-oriented programming;
 equivalent to @samp{@@defop Method @dots{}}.  @xref{Definition
-Commands}, and @ref{deffnx,, Def Cmds in Detail}.
+Commands}.
 
 @item @@defop @var{category} @var{class} @var{name} @address@hidden
 @itemx @@defopx @var{category} @var{class} @var{name} @address@hidden
@@ -20296,14 +20295,12 @@
 @item @@defopt @var{option-name}
 @itemx @@defoptx @var{option-name}
 Format a description for a user option; equivalent to @samp{@@defvr
address@hidden address@hidden @dots{}}.  @xref{Definition Commands}, and
address@hidden,, Def Cmds in Detail}.
address@hidden address@hidden @dots{}}.  @xref{Definition Commands}.
 
 @item @@defspec @var{special-form-name} @address@hidden
 @itemx @@defspecx @var{special-form-name} @address@hidden
 Format a description for a special form; equivalent to @samp{@@deffn
address@hidden address@hidden @dots{}}.  @xref{Definition Commands}, and
address@hidden,, Def Cmds in Detail}.
address@hidden address@hidden @dots{}}.  @xref{Definition Commands}.
 
 @item @@deftp @var{category} @var{name-of-type} @address@hidden
 @itemx @@deftpx @var{category} @var{name-of-type} @address@hidden
@@ -20322,8 +20319,7 @@
 Format a description for a function or similar entity that may take
 arguments and that is typed.  @code{@@deftypefn} takes as arguments the
 category of entity being described, the type, the name of the
-entity, and its arguments, if any.  @xref{Definition Commands}, and
address@hidden,, Def Cmds in Detail}.
+entity, and its arguments, if any.  @xref{Definition Commands}.
 
 @item @@deftypefnnewline @var{on-off}
 Specifies whether return types for @code{@@deftypefn} and similar are
@@ -20334,7 +20330,7 @@
 @itemx @@deftypefunx @var{data-type} @var{function-name} @address@hidden
 Format a description for a function in a typed language.
 The command is equivalent to @samp{@@deftypefn Function @dots{}}.
address@hidden Commands}, and @ref{deffnx,, Def Cmds in Detail}.
address@hidden Commands}.
 
 @item @@deftypeivar @var{class} @var{data-type} @var{variable-name}
 @itemx @@deftypeivarx @var{class} @var{data-type} @var{variable-name}
@@ -20344,7 +20340,7 @@
 @item @@deftypemethod @var{class} @var{data-type} @var{method-name} 
@address@hidden
 @itemx @@deftypemethodx @var{class} @var{data-type} @var{method-name} 
@address@hidden
 Format a description for a typed method in object-oriented programming.
address@hidden Commands}, and @ref{deffnx,, Def Cmds in Detail}.
address@hidden Commands}.
 
 @item @@deftypeop @var{category} @var{class} @var{data-type} @var{name} 
@address@hidden
 @itemx @@deftypeopx @var{category} @var{class} @var{data-type} @var{name} 
@address@hidden
@@ -20355,34 +20351,30 @@
 @itemx @@deftypevarx @var{data-type} @var{variable-name}
 Format a description for a variable in a typed language.  The command is
 equivalent to @samp{@@deftypevr Variable @dots{}}.  @xref{Definition
-Commands}, and @ref{deffnx,, Def Cmds in Detail}.
+Commands}.
 
 @item @@deftypevr @var{category} @var{data-type} @var{name}
 @itemx @@deftypevrx @var{category} @var{data-type} @var{name}
 Format a description for something like a variable in a typed
 language---an entity that records a value.  Takes as arguments the
 category of entity being described, the type, and the name of the
-entity.  @xref{Definition Commands}, and @ref{deffnx,, Def Cmds in
-Detail}.
+entity.  @xref{Definition Commands}.
 
 @item @@defun @var{function-name} @address@hidden
 @itemx @@defunx @var{function-name} @address@hidden
 Format a description for a function; equivalent to
address@hidden@@deffn Function @dots{}}.  @xref{Definition Commands}, and
address@hidden,, Def Cmds in Detail}.
address@hidden@@deffn Function @dots{}}.  @xref{Definition Commands}.
 
 @item @@defvar @var{variable-name}
 @itemx @@defvarx @var{variable-name}
 Format a description for a variable; equivalent to @samp{@@defvr
-Variable @dots{}}.  @xref{Definition Commands}, and @ref{deffnx,, Def
-Cmds in Detail}.
+Variable @dots{}}.  @xref{Definition Commands}.
 
 @item @@defvr @var{category} @var{name}
 @itemx @@defvrx @var{category} @var{name}
 Format a description for any kind of variable.  @code{@@defvr} takes
 as arguments the category of the entity and the name of the entity.
address@hidden Commands},
-and @ref{deffnx,, Def Cmds in Detail}.
address@hidden Commands}.
 
 @item @@detailmenu
 Mark the (optional) detailed node listing in a master menu.
@@ -20425,7 +20417,7 @@
 
 @item @@documentencoding @var{enc}
 Declare the input encoding to be @var{enc}.
address@hidden,, @code{@@documentencoding}}.
address@hidden@code{@@documentencoding}}.
 
 @item @@documentlanguage @var{CC}
 Declare the document language as the two-character ISO-639 abbreviation
@@ -21943,7 +21935,7 @@
 as:
 
 @example
-$Id: texinfo.txi,v 1.520 2013/01/13 23:23:16 karl Exp $
+$Id: texinfo.txi,v 1.521 2013/01/14 00:36:33 karl Exp $
 @end example
 
 (This is potentially useful in all sources that use version control,
@@ -23348,7 +23340,7 @@
 End:
 @end example
 
address@hidden,, @code{@@documentencoding}}.
address@hidden@code{@@documentencoding}}.
 
 
 @node Info Format Regular Nodes