Add 2012 to FSF copyright years for Emacs files

[bpt/emacs.git] / doc / emacs / emacs-xtra.texi

diff --git a/doc/emacs/emacs-xtra.texi b/doc/emacs/emacs-xtra.texi
index ce3fe8a..596cc13 100644 (file)
--- a/doc/emacs/emacs-xtra.texi
+++ b/doc/emacs/emacs-xtra.texi
@@ -2,6 +2,7 @@
 @comment %**start of header
 @setfilename ../../info/emacs-xtra
 @settitle Specialized Emacs Features
+@c Merge all functions, variables, and keys into the concept index.
 @syncodeindex fn cp
 @syncodeindex vr cp
 @syncodeindex ky cp
@@ -10,20 +11,21 @@
 @copying
 This manual describes specialized features of Emacs.
 
-Copyright @copyright{} 2004, 2005, 2006, 2007, 2008 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.2 or
+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.
 
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
+(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
@@ -81,12 +83,26 @@ However, certain sections may be intended for a more specialized
 audience, such as Elisp authors.  This should be clearly pointed out
 at the beginning of these sections.
 
-Certain packages, or collections of related features, have their own
-manuals, separate from the main Emacs User's manual.  This manual is
+@c Note to authors - you need to be careful about cross-references to
+@c topics in the Emacs manual.  As a printed document, the xtra files
+@c are separate from the Emacs manual; but as an info document, they
+@c are part of the Emacs manual.  Hence you need to use something like:
+@c @iftex
+@c @ref{Comparing Files,,, emacs, the Emacs Manual},
+@c @end iftex
+@c @ifnottex
+@c @ref{Comparing Files},
+@c @end ifnottex
+
+Certain packages (or collections of related features) have their own
+manuals, separate from the main Emacs manual.  This manual is
 intended as a complement, rather than an alternative, to reading those
-additional manuals; in a nutshell, it is a collection of smaller
-specialized features, too small or too obscure to justify their own
-manual.
+additional manuals.  In a nutshell, it is a collection of smaller
+specialized features (or extra detail about standard features), too
+small or too obscure to justify their own manual, or inclusion in the
+printed Emacs manual.  The chapters in this manual are, however,
+included (at the relevant places) in the main Emacs manual when it is
+formatted as an Info document.
 
 Sections intended specifically for Elisp programmers can follow the
 style of the Elisp manual.  Other sections should follow the style of
@@ -120,7 +136,3 @@ the Emacs manual.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 75c33f13-32c6-41b6-9537-847a312e2e49
-@end ignore