* doc/emacs/emacs-xtra.texi (copying): The FSF does not sell copies of this.

Simply include doclicense.

2 files changed, 14 insertions, 11 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f51ee2e9ff3..5c52cb2073c 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-21  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-xtra.texi (copying): The FSF does not sell copies of this.
+        Simply include doclicense.
+
 2012-12-21  Chong Yidong  <cyd@gnu.org>
 
         * frames.texi (Mouse Commands): Fix description of the effect of
diff --git a/doc/emacs/emacs-xtra.texi b/doc/emacs/emacs-xtra.texi
index 78cac7d8a10..44df5e1bf46 100644
--- a/doc/emacs/emacs-xtra.texi
+++ b/doc/emacs/emacs-xtra.texi
@@ -17,19 +17,12 @@ Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
 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 @@ license to the document, as described in section 6 of the license.
 * 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 @@ the Emacs manual.
 @lowersections
 @end iftex
 
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+@include doclicense.texi
+
 @node Index
 @unnumbered Index