texinfo ChangeLog doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       11/09/26 18:47:46

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        (GNU Sample Texts): change example to be without cover texts, since 
that is by far the most common case

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1255&r2=1.1256
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.384&r2=1.385

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1255
retrieving revision 1.1256
diff -u -b -r1.1255 -r1.1256
--- ChangeLog   25 Sep 2011 22:07:03 -0000      1.1255
+++ ChangeLog   26 Sep 2011 18:47:45 -0000      1.1256
@@ -1,8 +1,14 @@
+2011-09-26  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (GNU Sample Texts): change example to be
+       without cover texts, since that is by far the most common case.
+       Update years.
+
 2011-09-26  Patrice Dumas  <address@hidden>
 
        * Makefile.am (SUBDIRS, DIST_SUBDIRS), configure.ac, po*/POTFILES.in: 
-       build and distribute the Parser in tp.  Don't build texi2html, but still
-       distribute it.
+       build and distribute the Parser in tp.  Don't build texi2html, but
+       still distribute it.
 
 2011-09-25  Karl Berry  <address@hidden>
 

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -b -r1.384 -r1.385
--- doc/texinfo.txi     25 Sep 2011 18:36:04 -0000      1.384
+++ doc/texinfo.txi     26 Sep 2011 18:47:45 -0000      1.385
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.384 2011/09/25 18:36:04 karl Exp $
address@hidden $Id: texinfo.txi,v 1.385 2011/09/26 18:47:45 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.
 
@@ -1548,7 +1548,7 @@
 @@copying
 This is a short example of a complete Texinfo file, version 1.0.
 
-Copyright @@address@hidden@} 2009 Free Software Foundation, Inc.
+Copyright @@address@hidden@} 2011 Free Software Foundation, Inc.
 @@end copying
 @end group
 @end example
@@ -23098,7 +23098,7 @@
 @@copying
 This is a short example of a complete Texinfo file.
 
-Copyright @@address@hidden@} 2010 Free Software Foundation, Inc.
+Copyright @@address@hidden@} 2011 Free Software Foundation, Inc.
 @@end copying
 
 @@titlepage
@@ -23188,7 +23188,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.384 2011/09/25 18:36:04 karl Exp $
+$Id: texinfo.txi,v 1.385 2011/09/26 18:47:45 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}
@@ -23244,17 +23244,9 @@
 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 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.
-
address@hidden
-If your manual has Invariant Sections (again, see the license itself
-for details), then change the text here accordingly.
+If your manual is published on paper by the FSF or is longer than 400
+pages, you should include the standard FSF cover texts (@pxref{License
+Notices for Documentation,,, maintain, GNU Maintainer Information}).
 
 @item
 For documents that express your personal views, feelings or experiences,
@@ -23267,7 +23259,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.384 2011/09/25 18:36:04 karl Exp $
address@hidden $Id: texinfo.txi,v 1.385 2011/09/26 18:47:45 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi
@@ -23278,20 +23270,15 @@
 This manual is for GNU Sample (version @value{VERSION}, @value{UPDATED}),
 which is an example in the Texinfo documentation.
 
-Copyright @copyright{} 2010 Free Software Foundation, Inc.
+Copyright @copyright{} 2011 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.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
-license is included in the section entitled ``GNU Free Documentation
-License.''
-
-(a) The FSF's Back-Cover Text is: ``You have the freedom to
-copy and modify this GNU manual.  Buying copies from the FSF
-supports it in developing GNU and promoting software freedom.''
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the section entitled
+``GNU Free Documentation License''.
 @end quotation
 @end copying
 
@@ -23303,7 +23290,7 @@
 @titlepage
 @title GNU Sample
 @subtitle for version @value{VERSION}, @value{UPDATED}
address@hidden A.U. Thor (@email{bug-texinfo@@gnu.org})
address@hidden A.U. Thor (@email{bug-sample@@gnu.org})
 @page
 @vskip 0pt plus 1filll
 @insertcopying
@@ -23357,7 +23344,7 @@
 @cindex Verbatim copying license
 @cindex License for verbatim copying
 
-For software manuals and other documentation, it is important to use a
+For software manuals and other documentation, it is critical to use a
 license permitting free redistribution and updating, so that when a free
 program is changed, the documentation can be updated as well.
 
@@ -23373,7 +23360,7 @@
 @copying
 This document is a sample for allowing verbatim copying only.
 
-Copyright @copyright{} 2009 Free Software Foundation, Inc.
+Copyright @copyright{} 2011 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to make and distribute verbatim copies
@@ -23404,7 +23391,7 @@
 previous sections.
 
 @example
-Copyright @@address@hidden@} 2009 Free Software Foundation, Inc.
+Copyright @@address@hidden@} 2011 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright