texinfo ChangeLog doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       12/04/13 22:51:18

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        clarify @shortcaption

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1346&r2=1.1347
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.431&r2=1.432

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1346
retrieving revision 1.1347
diff -u -b -r1.1346 -r1.1347
--- ChangeLog   13 Apr 2012 16:56:53 -0000      1.1346
+++ ChangeLog   13 Apr 2012 22:51:17 -0000      1.1347
@@ -1,5 +1,7 @@
 2012-04-13  Karl Berry  <address@hidden>
 
+       * doc/texinfo.txi (Command Contexts): clarify @shortcaption, etc.
+
        * tp/texi2any.pl (configured_version): add +dev to distinguish
        from installed.
 

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -b -r1.431 -r1.432
--- doc/texinfo.txi     10 Apr 2012 18:08:18 -0000      1.431
+++ doc/texinfo.txi     13 Apr 2012 22:51:17 -0000      1.432
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.431 2012/04/10 18:08:18 karl Exp $
address@hidden $Id: texinfo.txi,v 1.432 2012/04/13 22:51:17 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.
 
@@ -21320,9 +21320,9 @@
 
 @code{@@c}, @code{@@comment} and @code{@@if ... @@end if} conditional
 commands may appear anywhere (except the conditionals must still be on
-lines by themselves).  @code{@@caption} and @code{@@shortcaption} may
-only appear in @code{@@float} but may contain general text.
address@hidden@@footnote} content likewise.
+lines by themselves).  @code{@@caption} may only appear in
address@hidden@@float} but may contain general text.  @code{@@footnote}
+content likewise.
 
 @@-commands with braces marking text (such as @code{@@strong},
 @code{@@sc}, @code{@@asis}) may contain raw formatter commands such as
@@ -21338,14 +21338,16 @@
 In addition to the above, sectioning commands cannot contain
 @code{@@anchor} or @code{@@footnote}.
 
-In the addition to the above, remaining commands (@code{@@node},
+In addition to the above, remaining commands (@code{@@node},
 @code{@@anchor}, @code{@@printindex}, @code{@@ref}, @code{@@math},
 @code{@@cindex}, @code{@@url}, @code{@@image}, and so on) cannot
 contain cross reference commands (@code{@@ref}, @code{@@xref},
address@hidden@@pxref} and @code{@@inforef}).
address@hidden@@pxref} and @code{@@inforef}).  In one last addition,
address@hidden@@shortcaption} may only appear inside @code{@@float}.
 
-For precise and complete information, we suggest looking into the test
-suites in the sources, which exhaustively try the combinations.
+For precise and complete information, we suggest looking into the
+extensive test suite in the sources, which exhaustively try
+combinations.
 
 
 @node Tips
@@ -21889,7 +21891,7 @@
 Revision Control System}) or other version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.431 2012/04/10 18:08:18 karl Exp $
+$Id: texinfo.txi,v 1.432 2012/04/13 22:51:17 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}