[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111056: * doc/emacs/emacs-xtra.texi (copying): The FSF does not sell copies of this.

[Glenn Morris]

------------------------------------------------------------
revno: 111056
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-12-21 11:08:32 -0800
message:
  * doc/emacs/emacs-xtra.texi (copying): The FSF does not sell copies of this.
  Simply include doclicense.
modified:
  doc/emacs/ChangeLog
  doc/emacs/emacs-xtra.texi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-12-21 03:04:38 +0000
+++ b/doc/emacs/ChangeLog       2012-12-21 19:08:32 +0000
@@ -1,3 +1,8 @@
+2012-12-21  Glenn Morris  <address@hidden>
+
+       * emacs-xtra.texi (copying): The FSF does not sell copies of this.
+       Simply include doclicense.
+
 2012-12-21  Chong Yidong  <address@hidden>
 
        * frames.texi (Mouse Commands): Fix description of the effect of

=== modified file 'doc/emacs/emacs-xtra.texi'
--- a/doc/emacs/emacs-xtra.texi 2012-02-21 19:56:14 +0000
+++ b/doc/emacs/emacs-xtra.texi 2012-12-21 19:08:32 +0000
@@ -17,19 +17,12 @@
 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'' in the Emacs manual.
+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.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+modify this GNU manual.''
 @end quotation
 @end copying
 
@@ -71,6 +64,7 @@
 * Fortran::             Fortran mode and its special features.
 * MS-DOS::              Using Emacs on MS-DOS.
 @end iftex
+* GNU Free Documentation License::  The license for this documentation.
 * Index::
 @end menu
 
@@ -131,6 +125,10 @@
 @lowersections
 @end iftex
 
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
 @node Index
 @unnumbered Index