texinfo ChangeLog doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       09/03/29 00:48:35

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        literal copyright symbols and other typos

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.991&r2=1.992
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.241&r2=1.242

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.991
retrieving revision 1.992
diff -u -b -r1.991 -r1.992
--- ChangeLog   29 Mar 2009 00:34:19 -0000      1.991
+++ ChangeLog   29 Mar 2009 00:48:34 -0000      1.992
@@ -1,4 +1,9 @@
-2009-03-27  Christopher Faylor  <address@hidden>  (tiny change)
+2009-03-28  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (GNU Sample Texts): no literal copyright symbol;
+       plus other typos and updates reported by Arni Magnusson.
+
+2009-03-28  Christopher Faylor  <address@hidden>  (tiny change)
 
        * system.h: Avoid erroneously redefining PIPE_USE_FORK when compiling
        for Cygwin.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -b -r1.241 -r1.242
--- doc/texinfo.txi     20 Mar 2009 18:33:52 -0000      1.241
+++ doc/texinfo.txi     29 Mar 2009 00:48:34 -0000      1.242
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.241 2009/03/20 18:33:52 karl Exp $
address@hidden $Id: texinfo.txi,v 1.242 2009/03/29 00:48:34 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.
 
@@ -1516,7 +1516,7 @@
 @@copying
 This is a short example of a complete Texinfo file, version 1.0.
 
-Copyright @@address@hidden@} 2005 Free Software Foundation, Inc.
+Copyright @@address@hidden@} 2009 Free Software Foundation, Inc.
 @@end copying
 @end group
 @end example
@@ -11077,10 +11077,10 @@
 @findex geq
 @findex leq
 
-Use the @code{@@address@hidden@}} and @code{@@address@hidden@}} commands to 
generate
+Use the @code{@@address@hidden@}} and @code{@@address@hidden@}} commands to 
generate
 greater-than-or-equal and less-than-equal-signs, address@hidden' and
 address@hidden'.  In plain text and Info output, these are the ASCII
-sequences @samp{>=} and @samp{<=}.  The
+sequences @samp{>=} and @samp{<=}.
 
 
 @node math
@@ -12359,7 +12359,7 @@
 This shows a rather terse definition for a ``command'' named
 @code{forward-char} with one argument, @var{nchars}.
 
address@hidden@@deffn} and prints argument names such as @var{nchars} in slanted
address@hidden@@deffn} prints argument names such as @var{nchars} in slanted
 type in the printed output, because we think of these names as
 metasyntactic variables---they stand for the actual argument values.
 Within the text of the description, however, write an argument name
@@ -13059,7 +13059,6 @@
 @end defun
 @end quotation
 
address@hidden 1200
 In the Texinfo source file, this example looks like this:
 
 @example
@@ -13768,10 +13767,10 @@
 
 @cindex @address@hidden
 For @TeX{}, this command causes a file @address@hidden to
-be read (if it exists).  If @code{@@setdocumentlanguage} argument
+be read (if it exists).  If @code{@@documentlanguage} argument
 contains the optional @address@hidden suffix, this is tried first.
-For example, with @code{@@setdocumentlanguage de_DE}, @TeX{} first
-looks for @file{txi-de_DE.tex}, then @file{txi-de.tex}.
+For example, with @code{@@documentlanguage de_DE}, @TeX{} first looks
+for @file{txi-de_DE.tex}, then @file{txi-de.tex}.
 
 Such a @file{txi-*} file is intended to redefine the various English
 words used in @TeX{} output, such as `Chapter', `See', and so on.  We
@@ -19209,7 +19208,7 @@
 @@copying
 This is a short example of a complete Texinfo file.
 
-Copyright @copyright{} 2005 Free Software Foundation, Inc.
+Copyright @@address@hidden@} 2009 Free Software Foundation, Inc.
 @@end copying
 
 @@titlepage
@@ -19272,7 +19271,7 @@
 @cindex Full texts, GNU
 
 Following is a sample Texinfo document with the full texts that should
-be used in GNU manuals.
+be used (adapted as necessary) in GNU manuals.
 
 As well as the legal texts, it also serves as a practical example of how
 many elements in a GNU system can affect the manual.  If you're not
@@ -19299,7 +19298,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.241 2009/03/20 18:33:52 karl Exp $
+$Id: texinfo.txi,v 1.242 2009/03/29 00:48:34 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}
@@ -19307,9 +19306,8 @@
 documentation version.
 
 If you want to literally write @address@hidden, use @code{@@w}:
address@hidden@@address@hidden@}Id$}.  Unfortunately, this technique does not 
currently
-work in plain text output, since it's not clear what should be done.
-We hope to find a solution in a future release.
address@hidden@@address@hidden@}Id$}.  Unfortunately, this technique does not 
work in
+plain text output, where it's not clear what should be done.
 
 @item
 @pindex address@hidden, and version info}
@@ -19356,9 +19354,13 @@
 If the FSF is not the copyright holder, then use the appropriate name.
 
 @item
-If your manual is not published on paper by the FSF, then omit the
-last sentence in the Back-Cover Text that talks about copies from GNU
-Press.
+If your manual is not published on paper by the FSF, then definitely
+omit the last sentence in the Back-Cover Text that talks about copies
+from GNU Press.
+
address@hidden
+GNU packages can entirely omit both cover texts if it is not published
+on paper by the FSF, at the package maintainer's discretion.
 
 @item
 If your manual has Invariant Sections (again, see the license itself
@@ -19375,7 +19377,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.241 2009/03/20 18:33:52 karl Exp $
address@hidden $Id: texinfo.txi,v 1.242 2009/03/29 00:48:34 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi
@@ -19386,11 +19388,11 @@
 This manual is for GNU Sample (version @value{VERSION}, @value{UPDATED}),
 which is an example in the Texinfo documentation.
 
-Copyright @copyright{} 2007 Free Software Foundation, Inc.
+Copyright @copyright{} 2009 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
 and with the Back-Cover Texts as in (a) below.  A copy of the
@@ -19481,7 +19483,7 @@
 @copying
 This document is a sample for allowing verbatim copying only.
 
-Copyright @copyright{} 2005 Free Software Foundation, Inc.
+Copyright @copyright{} 2009 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to make and distribute verbatim copies
@@ -19512,7 +19514,7 @@
 previous sections.
 
 @example
-Copyright @copyright{} 2005 Free Software Foundation, Inc.
+Copyright @@address@hidden@} 2009 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright