Merge from origin/emacs-24

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

diff --git a/doc/emacs/emacs-xtra.texi b/doc/emacs/emacs-xtra.texi
index f67ed3d5cade7ec7a0a8127f3f8c0ccdb3b058bb..fcedf7308a83e6ff67af5609884d912cfbb2050f 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,13 +11,13 @@
 @copying
 This manual describes specialized features of Emacs.
 
-Copyright @copyright{} 2004--2013 Free Software Foundation, Inc.
+Copyright @copyright{} 2004--2015 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,''
+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''.
 
@@ -120,7 +120,7 @@ the Emacs manual.
 
 @include fortran-xtra.texi
 
-@include msdog-xtra.texi
+@include msdos-xtra.texi
 
 @lowersections
 @end iftex