texinfo update (Tue Dec 14 11:52:01 EST 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.430
retrieving revision 1.431
diff -c -r1.430 -r1.431
*** ChangeLog   14 Dec 2004 00:15:36 -0000      1.430
--- ChangeLog   14 Dec 2004 16:58:14 -0000      1.431
***************
*** 1,3 ****
--- 1,9 ----
+ 2004-12-14  Karl Berry  <address@hidden>
+ 
+       * doc/texinfo.txi (pxref): more explanation.
+       * doc/info-stnd.texi (Basic Windows): put pxref in parens.
+       help-texinfo mail from adl, 13 Dec 2004 17:07:50 +0100.
+ 
  2004-12-13  Andreas Schwab  <address@hidden>
  
        * info/echo-area.c (DECLARE_INFO_COMMAND): Add intermediate cast
Index: doc/info-stnd.texi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/info-stnd.texi,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** doc/info-stnd.texi  6 Oct 2004 21:29:48 -0000       1.8
--- doc/info-stnd.texi  14 Dec 2004 16:58:15 -0000      1.9
***************
*** 1,5 ****
  \input texinfo.tex    @c -*-texinfo-*-
! @comment $Id: info-stnd.texi,v 1.8 2004/10/06 21:29:48 karl Exp $
  @c We must \input texinfo.tex instead of texinfo, otherwise make
  @c distcheck in the Texinfo distribution fails, because the texinfo Info
  @c file is made first, and texi2dvi must include . first in the path.
--- 1,5 ----
  \input texinfo.tex    @c -*-texinfo-*-
! @comment $Id: info-stnd.texi,v 1.9 2004/12/14 16:58:15 karl Exp $
  @c We must \input texinfo.tex instead of texinfo, otherwise make
  @c distcheck in the Texinfo distribution fails, because the texinfo Info
  @c file is made first, and texi2dvi must include . first in the path.
***************
*** 1302,1309 ****
  Each window is one half the size of the original window, and the cursor
  remains in the original window.  The variable @code{automatic-tiling}
  can cause all of the windows on the screen to be resized for you
! automatically, please @pxref{Variables, , automatic-tiling} for more
! information.
  
  @item @kbd{C-x @key{0}} (@code{delete-window})
  @cindex windows, deleting
--- 1302,1308 ----
  Each window is one half the size of the original window, and the cursor
  remains in the original window.  The variable @code{automatic-tiling}
  can cause all of the windows on the screen to be resized for you
! automatically (@pxref{Variables, , automatic-tiling}).
  
  @item @kbd{C-x @key{0}} (@code{delete-window})
  @cindex windows, deleting
Index: doc/texinfo.txi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.124
retrieving revision 1.125
diff -c -r1.124 -r1.125
*** doc/texinfo.txi     13 Dec 2004 14:15:14 -0000      1.124
--- doc/texinfo.txi     14 Dec 2004 16:58:15 -0000      1.125
***************
*** 1,5 ****
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.124 2004/12/13 14:15:14 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.
  
--- 1,5 ----
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.125 2004/12/14 16:58:15 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.
  
***************
*** 6317,6325 ****
  
  The parenthetical reference command, @code{@@pxref}, is nearly the
  same as @code{@@xref}, but you use it @emph{only} inside parentheses
! and you do @emph{not} type a comma or period after the command's
! closing brace.  The command differs from @code{@@xref} in two
! ways:@refill
  
  @enumerate
  @item
--- 6317,6325 ----
  
  The parenthetical reference command, @code{@@pxref}, is nearly the
  same as @code{@@xref}, but you use it @emph{only} inside parentheses
! and you do @emph{not} type a comma or period (or anything else) after
! the command's closing brace.  The command differs from @code{@@xref}
! in two ways:
  
  @enumerate
  @item
***************
*** 6334,6341 ****
  Because one type of formatting automatically inserts closing
  punctuation and the other does not, you should use @code{@@pxref}
  @emph{only} inside parentheses as part of another sentence.  Also, you
! yourself should not insert punctuation after the reference, as you do
! with @code{@@address@hidden
  
  @code{@@pxref} is designed so that the output looks right and works
  right between parentheses both in printed output and in an Info file.
--- 6334,6342 ----
  Because one type of formatting automatically inserts closing
  punctuation and the other does not, you should use @code{@@pxref}
  @emph{only} inside parentheses as part of another sentence.  Also, you
! yourself should not insert punctuation after the reference (or any
! other text), as you do with @code{@@xref}.  In the Info
! output, such text would follow a period, which is grammatically wrong.
  
  @code{@@pxref} is designed so that the output looks right and works
  right between parentheses both in printed output and in an Info file.
***************
*** 18455,18461 ****
  Concurrent Versions System}) or RCS (see rcsintro(1)) version control
  systems, which expand it into a string such as:
  @example
! $Id: texinfo.txi,v 1.124 2004/12/13 14:15:14 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}
--- 18456,18462 ----
  Concurrent Versions System}) or RCS (see rcsintro(1)) version control
  systems, which expand it into a string such as:
  @example
! $Id: texinfo.txi,v 1.125 2004/12/14 16:58:15 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}
***************
*** 18521,18527 ****
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.124 2004/12/13 14:15:14 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
--- 18522,18528 ----
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.125 2004/12/14 16:58:15 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
P ChangeLog
P doc/info-stnd.texi
P doc/texinfo.txi