texinfo update (Sat Jul 14 20:53:01 EDT 2007)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.731
retrieving revision 1.732
diff -u -r1.731 -r1.732
--- ChangeLog   12 Jul 2007 13:28:11 -0000      1.731
+++ ChangeLog   15 Jul 2007 00:51:04 -0000      1.732
@@ -1,3 +1,8 @@
+2007-07-14  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (@copying, GNU Sample Texts),
+       * doc/info-stnd.texi (@copying): update Back-Cover Text.
+
 2007-07-12  Karl Berry  <address@hidden>
 
        * makeinfo/lang.c (default_country_for_lang): strcasecmp returns 0
Index: doc/info-stnd.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/info-stnd.texi,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- doc/info-stnd.texi  25 Jul 2006 16:02:29 -0000      1.12
+++ doc/info-stnd.texi  15 Jul 2007 00:51:04 -0000      1.13
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: info-stnd.texi,v 1.12 2006/07/25 16:02:29 karl Exp $
address@hidden $Id: info-stnd.texi,v 1.13 2007/07/15 00:51:04 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.
@@ -30,8 +30,7 @@
 License.''
 
 (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
+this GNU Manual, like GNU software.''
 @end quotation
 @end copying
 
@@ -77,10 +76,9 @@
 * Miscellaneous Commands::      A few commands that defy categories.
 * Variables::                   How to change the default behavior of Info.
 * Custom Key Bindings::         How to define your own key-to-command bindings.
-* Copying This Manual::         The GNU Free Documentation License.
-* Index::                       Global index containing keystrokes,
-                                  command names, variable names,
-                                  and general concepts.
+* GNU Free Documentation License:: Copying and sharing this documentation.
+* Index::                          Global index with keystrokes, command names,
+                                     variable names, and general concepts.
 @end menu
 
 
@@ -2196,12 +2194,8 @@
 @end ignore
 
 
address@hidden Copying This Manual
address@hidden Copying This Manual
-
address@hidden
-* GNU Free Documentation License::  License for copying this manual.
address@hidden menu
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
 
 @include fdl.texi
 
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- doc/texinfo.txi     11 Jul 2007 00:16:23 -0000      1.201
+++ doc/texinfo.txi     15 Jul 2007 00:51:03 -0000      1.202
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.201 2007/07/11 00:16:23 karl Exp $
address@hidden $Id: texinfo.txi,v 1.202 2007/07/15 00:51:03 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.
 
@@ -168,7 +168,7 @@
 * Include Files::                 How to incorporate other Texinfo files.
 * Headings::                      How to write page headings and footings.
 * Catching Mistakes::             How to find formatting mistakes.
-* Copying This Manual::           The GNU Free Documentation License.
+* GNU Free Documentation License::Copying this manual.
 * Command and Variable Index::    A menu containing commands and variables.
 * General Index::                 A menu covering many topics.
 
@@ -637,9 +637,7 @@
 * Verbatim Copying License::
 * All-permissive Copying License::
 
-Copying This Manual
-
-* GNU Free Documentation License::  License for copying this manual.
+GNU Free Documentation License
 
 Include Files
 
@@ -675,10 +673,6 @@
 * Tagifying::                   How to tagify a file.
 * Splitting::                   How to split a file manually.
 
-Copying This Manual
-
-* GNU Free Documentation License::  License for copying this manual.
-
 @end detailmenu
 @end menu
 
@@ -18747,7 +18741,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.201 2007/07/11 00:16:23 karl Exp $
+$Id: texinfo.txi,v 1.202 2007/07/15 00:51:03 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}
@@ -18799,8 +18793,16 @@
 Free Documentation License}.
 
 @item
-If your manual has invariant sections (again, see the license itself for
-details), then don't forget to change the text here accordingly.
+If the FSF is not the copyright holder, then use the appropriate name.
+
address@hidden
+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.
+
address@hidden
+If your manual has Invariant Sections (again, see the license itself
+for details), then change the text here accordingly.
 
 @item
 For documents that express your personal views, feelings or experiences,
@@ -18813,7 +18815,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.201 2007/07/11 00:16:23 karl Exp $
address@hidden $Id: texinfo.txi,v 1.202 2007/07/15 00:51:03 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi
@@ -18824,7 +18826,7 @@
 This manual is for GNU Sample (version @value{VERSION}, @value{UPDATED}),
 which is an example in the Texinfo documentation.
 
-Copyright @copyright{} 2005 Free Software Foundation, Inc.
+Copyright @copyright{} 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -18882,12 +18884,8 @@
 and command line options here.
 
 
address@hidden Copying This Manual
address@hidden Copying This Manual
-
address@hidden
-* GNU Free Documentation License::  License for copying this manual.
address@hidden menu
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
 
 @include fdl.texi
 
@@ -20827,12 +20825,8 @@
 @end ignore
 
 
address@hidden Copying This Manual
address@hidden Copying This Manual
-
address@hidden
-* GNU Free Documentation License::  License for copying this manual.
address@hidden menu
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
 
 @include fdl.texi
 
P ChangeLog
P doc/info-stnd.texi
P doc/texinfo.txi