texinfo update (Wed Jan 18 09:52:01 EST 2006)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.560
retrieving revision 1.561
diff -c -r1.560 -r1.561
*** ChangeLog   18 Jan 2006 11:56:04 -0000      1.560
--- ChangeLog   18 Jan 2006 14:44:43 -0000      1.561
***************
*** 1,3 ****
--- 1,7 ----
+ 2006-01-18  Karl Berry  <address@hidden>
+ 
+       * doc/texinfo.txi (key): more examples.
+ 
  2006-01-18  Akim Demaille  <address@hidden>
  
        Sometimes the temporary directory remains.
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.153
retrieving revision 1.154
diff -c -r1.153 -r1.154
*** doc/texinfo.txi     26 Dec 2005 22:05:10 -0000      1.153
--- doc/texinfo.txi     18 Jan 2006 14:44:43 -0000      1.154
***************
*** 1,5 ****
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.153 2005/12/26 22:05:10 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.154 2006/01/18 14:44:43 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.
  
***************
*** 38,44 ****
  printed manual from a single source.
  
  Copyright (C) 1988, 1990, 1991, 1992, 1993, 1995, 1996, 1997, 1998,
! 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
  @quotation
  Permission is granted to copy, distribute and/or modify this document
--- 38,44 ----
  printed manual from a single source.
  
  Copyright (C) 1988, 1990, 1991, 1992, 1993, 1995, 1996, 1997, 1998,
! 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
  
  @quotation
  Permission is granted to copy, distribute and/or modify this document
***************
*** 6941,6947 ****
  
  
  @node key
- @comment  node-name,  next,  previous,  up
  @subsection @code{@@address@hidden@address@hidden
  @findex key
  
--- 6941,6946 ----
***************
*** 6956,6966 ****
  @code{@@kbd} command when the sequence of characters to be typed
  includes one or more keys that are described by address@hidden
  
! @need 700
! For example, to produce @kbd{C-x @key{ESC}} you would type:@refill
  
  @example
  @@address@hidden @@address@hidden@address@hidden
  @end example
  
  Here is a list of the recommended names for keys:
--- 6955,6966 ----
  @code{@@kbd} command when the sequence of characters to be typed
  includes one or more keys that are described by address@hidden
  
! For example, to produce @kbd{C-x @key{ESC}} and @address@hidden you
! would type:
  
  @example
  @@address@hidden @@address@hidden@address@hidden
+ @@address@hidden@@address@hidden@address@hidden
  @end example
  
  Here is a list of the recommended names for keys:
***************
*** 7004,7015 ****
  example, write @samp{@@address@hidden@}} to produce @kbd{Meta-a} and
  @samp{@@address@hidden@}} to produce @key{META}.
  
! @c I don't think this is a good explanation.
! @c I think it will puzzle readers more than it clarifies matters.  -- rms.
! @c In other words, use @code{@@kbd} for what you do, and use @code{@@key}
! @c for what you talk about: ``Press @code{@@address@hidden@}} to move point to
! @c the beginning of the sentence.  The @code{@@address@hidden@}} key is often 
in
! @c the lower left of the keyboard.''@refill
  
  @node samp
  @subsection @code{@@address@hidden@address@hidden
--- 7004,7012 ----
  example, write @samp{@@address@hidden@}} to produce @kbd{Meta-a} and
  @samp{@@address@hidden@}} to produce @key{META}.
  
! As a convention in GNU manuals, @code{@@key} should not be used in
! index entries.
! 
  
  @node samp
  @subsection @code{@@address@hidden@address@hidden
***************
*** 18002,18015 ****
  
  @table @asis
  @item 1. Non-alphabetic commands.
! These commands consist of an @@ followed by a punctuation mark or other
! character that is not part of the alphabet.  Non-alphabetic commands are
! almost always part of the text within a paragraph, and never take any
! argument.  The two characters (@@ and the other one) are complete in
! themselves; none is followed by braces.  The non-alphabetic commands
! are: @code{@@.}, @code{@@:}, @code{@@*}, @code{@@@kbd{SPACE}},
! @code{@@@kbd{TAB}}, @code{@@@kbd{NL}}, @code{@@@@}, @code{@@@{}, and
! @code{@@@address@hidden
  
  @item 2. Alphabetic commands that do not require arguments.
  These commands start with @@ followed by a word followed by left- and
--- 17999,18010 ----
  
  @table @asis
  @item 1. Non-alphabetic commands.
! These commands consist of an @@ followed by a punctuation mark or
! other character that is not part of the alphabet.  Non-alphabetic
! commands are almost always part of the text within a paragraph.  The
! non-alphabetic commands include @code{@@@@}, @code{@@@{}, @code{@@@}},
! @code{@@.}, @code{@@@kbd{SPACE}}, most of the accent commands, and
! many more.
  
  @item 2. Alphabetic commands that do not require arguments.
  These commands start with @@ followed by a word followed by left- and
***************
*** 18596,18602 ****
  (@url{http://www.gnu.org/software/rcs}) version control systems, which
  expand it into a string such as:
  @example
! $Id: texinfo.txi,v 1.153 2005/12/26 22:05:10 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}
--- 18591,18597 ----
  (@url{http://www.gnu.org/software/rcs}) version control systems, which
  expand it into a string such as:
  @example
! $Id: texinfo.txi,v 1.154 2006/01/18 14:44:43 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}
***************
*** 18662,18668 ****
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.153 2005/12/26 22:05:10 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
--- 18657,18663 ----
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.154 2006/01/18 14:44:43 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
P ChangeLog
P doc/texinfo.txi