texinfo ChangeLog doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       12/07/13 17:36:15

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        unify treatment of @acronym @abbr @email @image

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1385&r2=1.1386
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.455&r2=1.456

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1385
retrieving revision 1.1386
diff -u -b -r1.1385 -r1.1386
--- ChangeLog   6 Jul 2012 23:55:31 -0000       1.1385
+++ ChangeLog   13 Jul 2012 17:36:09 -0000      1.1386
@@ -1,6 +1,12 @@
+2012-07-13  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (HTML Xref Command Expansion): Clarify/unify
+       treatment of @acronym, @abbr, @email, @image.
+       (texinfo-devel 8 Jul 2012 09:38:25)
+
 2012-07-06  Karl Berry  <address@hidden>
 
-       Avoid "used uninitialized" warnings from gcc.
+       Avoid "may be used uninitialized" warnings from gcc.
        * info/infokey.c (compile): initialize seqstate.
        * info/window.c (process_node_text): initialize carried_over_len,
        carried_over_count, replen.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -b -r1.455 -r1.456
--- doc/texinfo.txi     6 Jul 2012 18:34:59 -0000       1.455
+++ doc/texinfo.txi     13 Jul 2012 17:36:11 -0000      1.456
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.455 2012/07/06 18:34:59 karl Exp $
address@hidden $Id: texinfo.txi,v 1.456 2012/07/13 17:36:11 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.
 
@@ -19264,7 +19264,7 @@
 @example
 @@asis @@b @@cite @@code @@command @@dfn @@dmn @@dotless
 @@emph @@env @@file @@i @@indicateurl @@kbd @@key
-@@samp @@sansserif @@sc @@slanted @@strong @@t @@var @@w
+@@samp @@sansserif @@sc @@slanted @@strong @@t @@var @@verb @@w
 @end example
 
 @noindent For @code{@@sc}, any letters are capitalized.
@@ -19320,23 +19320,15 @@
 @item @code{@@tie}              @tab (space)
 @end multitable
 
-Quotation mark commands (@code{@@address@hidden@}} and the like), are
-likewise replaced by their Unicode values.  Normal quotation
address@hidden (` and ') are not altered.  @xref{Inserting
-Quotation Marks}.
-
-An @code{@@acronym} or @code{@@abbr} command is replaced by the first
-argument, followed by the second argument in parentheses, if present.
address@hidden
-
-An @code{@@email} command is replaced by the @var{text} argument if
-present, else the address.  @xref{email}.
-
-An @code{@@image} command is replaced by the filename (first)
-argument.  @xref{Images}.
+Quotation mark @@-commands (@code{@@address@hidden@}} and the like),
+are likewise replaced by their Unicode values.  Normal quotation
address@hidden (e.g., ASCII ` and ') are not altered.
address@hidden Quotation Marks}.
 
-An @code{@@verb} command is replaced by its transformed argument.
address@hidden
+Any @code{@@acronym}, @code{@@abbr}, @code{@@email}, and
address@hidden@@image} commands are replaced by their first argument.  (For
+these commands, all subsequent arguments are optional, and ignored
+here.)  @xref{acronym}, and @ref{email}, and @ref{Images}.
 
 Any other command is an error, and the result is unspecified.
 
@@ -21966,7 +21958,7 @@
 Revision Control System}) or other version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.455 2012/07/06 18:34:59 karl Exp $
+$Id: texinfo.txi,v 1.456 2012/07/13 17:36:11 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}