Merge from emacs-24; up to 2014-07-28T06:28:15Z!dmantipov@yandex.ru

[gnu-emacs] / doc / emacs / emacs-xtra.texi

diff --git a/doc/emacs/emacs-xtra.texi b/doc/emacs/emacs-xtra.texi
index 78cac7d8a10bc3a388c7a3a1da8c5f1b8877a73a..ba2b0f0d67758a88523f78556f6b51df7b232b60 100644 (file)
--- a/doc/emacs/emacs-xtra.texi
+++ b/doc/emacs/emacs-xtra.texi
@@ -1,6 +1,6 @@
 \input texinfo    @c -*-texinfo-*-
 @comment %**start of header
-@setfilename ../../info/emacs-xtra
+@setfilename ../../info/emacs-xtra.info
 @settitle Specialized Emacs Features
 @c Merge all functions, variables, and keys into the concept index.
 @syncodeindex fn cp
@@ -11,29 +11,22 @@
 @copying
 This manual describes specialized features of Emacs.
 
-Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
+Copyright @copyright{} 2004--2014 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'' 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
 
-@documentencoding ISO-8859-1
+@documentencoding UTF-8
 
 @dircategory Emacs
 @direntry
@@ -60,7 +53,7 @@ license to the document, as described in section 6 of the license.
 @menu
 * Introduction::        What documentation belongs here?
 @iftex
-* Picture Mode::        Editing pictures made up of characters using 
+* Picture Mode::        Editing pictures made up of characters using
                          the quarter-plane screen model.
 
 * Autorevert::          Auto Reverting non-file buffers.
@@ -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
 
@@ -126,11 +120,15 @@ the Emacs manual.
 
 @include fortran-xtra.texi
 
-@include msdog-xtra.texi
+@include msdos-xtra.texi
 
 @lowersections
 @end iftex
 
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+@include doclicense.texi
+
 @node Index
 @unnumbered Index