texinfo ChangeLog doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/08/27 00:10:08

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        @@ vs. @code{@@}

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1117&r2=1.1118
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.296&r2=1.297

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1117
retrieving revision 1.1118
diff -u -b -r1.1117 -r1.1118
--- ChangeLog   26 Aug 2010 00:49:36 -0000      1.1117
+++ ChangeLog   27 Aug 2010 00:10:07 -0000      1.1118
@@ -1,3 +1,7 @@
+2010-08-26  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi: Systematize use of @@ vs. @code{@@}.
+
 2010-08-25  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (Init File General Block Commands): edit.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -b -r1.296 -r1.297
--- doc/texinfo.txi     26 Aug 2010 00:49:36 -0000      1.296
+++ doc/texinfo.txi     27 Aug 2010 00:10:08 -0000      1.297
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.296 2010/08/26 00:49:36 karl Exp $
address@hidden $Id: texinfo.txi,v 1.297 2010/08/27 00:10:08 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.
 
@@ -11261,7 +11261,7 @@
 @end example
 
 The @code{@@math} command has no special effect on the Info and HTML
-output.  @command{makeinfo} expands any @code{@@}-commands as usual,
+output.  @command{makeinfo} expands any @@-commands as usual,
 but it does not try to produce good mathematical formatting in any
 way.
 
@@ -12321,11 +12321,12 @@
 typed on one source line.
 
 Although this example only shows a one-line continuation,
-continuations may extend over any number of lines; simply put an
address@hidden@@} at the end of each line to be continued.
+continuations may extend over any number of lines, in the same way;
+put an @code{@@} at the end of each line to be continued.
 
-The @code{@@} character does not have to be the last character on the
-physical line: whitespace is allowed (and ignored) afterwards.
+Technically, the @code{@@} character does not have to be the last
+character on the physical line: whitespace is allowed (and ignored)
+afterwards.
 
 @cindex Whitespace, collapsed around continuations
 @cindex Collapsing whitespace around continuations
@@ -12341,13 +12342,13 @@
 @end example
 
 @noindent The output (not shown) has excess space between `Category'
-and `Name'.  In this case, simply elide any unwanted whitespace in
+and `Name'.  In this case, simply elide the unwanted whitespace in
 your input, or put the continuation @code{@@} outside braces.
 
address@hidden@@} does not (currently) function as a continuation character in
address@hidden other context.  Ordinarily, @samp{@@} followed by a
-whitespace character (space, tab, newline) produces a normal interword
-space (@pxref{Multiple Spaces}).
address@hidden@@} does not function as a continuation character in @emph{any}
+other context.  Ordinarily, @samp{@@} followed by a whitespace
+character (space, tab, newline) produces a normal interword space
+(@pxref{Multiple Spaces}).
 
 
 @node Optional Arguments
@@ -16035,9 +16036,8 @@
 @item --commands-in-node-names
 @opindex --commands-in-node-names
 This option now does nothing, but remains for compatibility.  (It used
-to ensure that @code{@@}-commands in node names were expanded
-throughout the document, especially @code{@@value}.  This is now done
-by default.)
+to ensure that @@-commands in node names were expanded throughout the
+document, especially @code{@@value}.  This is now done by default.)
 
 @item address@hidden
 @opindex address@hidden
@@ -19329,7 +19329,8 @@
 
 These function references are called as follows, respectively:
 
address@hidden {Function Reference} $status 
address@hidden'$command'@}->@{'init'@} $command $text $count
address@hidden {Function Reference} $status @
+           address@hidden'$command'@}->@{'init'@} $command $text $count
 @var{$command} is the @@-command name, @var{$text} is the text
 appearing within the @@-command, and @var{$count} counts how many
 times this @@-command has appeared.  @var{$status} is a boolean to return,
@@ -19337,7 +19338,8 @@
 and the text are discarded.
 @end deftypefn
 
address@hidden {Function Reference} $result 
address@hidden'$command'@}->@{'expand'@} $command $count \%state $text
address@hidden {Function Reference} $result @
+     address@hidden'$command'@}->@{'expand'@} $command $count \%state $text
 @var{$command} is the @@-command name, @var{$count} counts how many
 times this @@-command has appeared, and @var{\%state} is a hash
 reference with detailed context information; @var{$text} should be
@@ -19352,16 +19354,16 @@
 @cindex General block commands, in init files
 @cindex Block commands, in init files
 
-A @dfn{general block @code{@@}-command} is any @code{@@}-command which
-is paired with an @code{@@end @var{cmdname}}, with the exception of
-those @code{@@}-commands selecting whether input is processed (such as
address@hidden@@ignore} and @code{@@ifhtml}) and ``raw'' @code{@@}-commands
-(such as @code{@@verbatim} and @code{@@html}).
+A @dfn{general block @@-command} is any @@-command which is paired
+with an @code{@@end @var{cmdname}}, with the exception of those
+@@-commands selecting whether input is processed (such as
address@hidden@@ignore} and @code{@@ifhtml}) and ``raw'' @@-commands (such as
address@hidden@@verbatim} and @code{@@html}).
 
 @deftypefn {Function Reference} $line begin_format_texi $command $line \%state
 @var{$command} is the format command, @var{$line} is the rest of the
-line following the @code{@@}-command, and @var{\%state} is a hash
-reference with detailed context information.  The function can modify
+line following the @@-command, and @var{\%state} is a hash reference
+with detailed context information.  The function can modify
 @code{$line} and return something else.
 @end deftypefn
 
@@ -23264,10 +23266,10 @@
 @item \input @var{macro-definitions-file}
 Use the specified macro definitions file.  This command is used only
 in the first line of a Texinfo file to cause @TeX{} to make use of the
address@hidden macro definitions file.  The backslash in @code{\input}
-is used instead of an @code{@@} because @TeX{} does not
-recognize @code{@@} until after it has read the definitions file.
address@hidden File Header}.
address@hidden macro definitions file.  The @code{\} in @code{\input}
+is used instead of an @code{@@} because @TeX{} does not recognize
address@hidden@@} until after it has read the definitions file.  @xref{Texinfo
+File Header}.
 
 @item @@item
 Indicate the beginning of a marked paragraph for @code{@@itemize} and
@@ -24434,7 +24436,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.296 2010/08/26 00:49:36 karl Exp $
+$Id: texinfo.txi,v 1.297 2010/08/27 00:10:08 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}
@@ -24513,7 +24515,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.296 2010/08/26 00:49:36 karl Exp $
address@hidden $Id: texinfo.txi,v 1.297 2010/08/27 00:10:08 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi