Hyphen and dash fixes in texinfo files.

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

diff --git a/doc/emacs/emacs-xtra.texi b/doc/emacs/emacs-xtra.texi
index 9d20b335355399c4ec3951ca1af1fae076972383..09930606b99ad56491252c6add974c741962381d 100644 (file)
--- a/doc/emacs/emacs-xtra.texi
+++ b/doc/emacs/emacs-xtra.texi
@@ -11,29 +11,23 @@
 @copying
 This manual describes specialized features of Emacs.
 
-Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+Copyright @copyright{} 2004--2012 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
+
 @dircategory Emacs
 @direntry
 * Emacs-Xtra: (emacs-xtra).    Specialized Emacs features.
@@ -59,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.
@@ -68,8 +62,9 @@ license to the document, as described in section 6 of the license.
 * Emerge::              A convenient way of merging two versions of a program.
 * Advanced VC Usage::   Advanced VC (version control) features.
 * Fortran::             Fortran mode and its special features.
-* MS-DOS::              Using Emacs on MS-DOS (otherwise known as @dfn{MS-DOG}).
+* MS-DOS::              Using Emacs on MS-DOS.
 @end iftex
+* GNU Free Documentation License::  The license for this documentation.
 * Index::
 @end menu
 
@@ -109,10 +104,10 @@ style of the Elisp manual.  Other sections should follow the style of
 the Emacs manual.
 
 @iftex
-@c ``Picture Mode'' is a chapter, not a section, so it's outside @raisesections.
-@include picture-xtra.texi
 
 @raisesections
+@include picture-xtra.texi
+
 @include arevert-xtra.texi
 
 @include dired-xtra.texi
@@ -130,13 +125,13 @@ the Emacs manual.
 @lowersections
 @end iftex
 
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+@include doclicense.texi
+
 @node Index
 @unnumbered Index
 
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 75c33f13-32c6-41b6-9537-847a312e2e49
-@end ignore