(Program Modes): Replace inforef to emacs-xtra by conditional xref's, depending

[gnu-emacs] / lispref / vol2.texi

diff --git a/lispref/vol2.texi b/lispref/vol2.texi
index 349a886324f916da0cd28377c636bfc3cb8e078c..e5da029db1acb67879355b5818f36031545fd588 100644 (file)
--- a/lispref/vol2.texi
+++ b/lispref/vol2.texi
@@ -1,3 +1,12 @@
+This file is obsolete, and no longer part of the Emacs Lisp Reference Manual.
+It is still present in CVS in case we ever want to use some of it again.
+
+@c This is part of the GNU Emacs Lisp Reference Manual.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c See the file elisp.texi for copying conditions.
+
+
 \input texinfo  @c -*-texinfo-*-
 @c %**start of header
 @setfilename elisp
@@ -126,44 +135,8 @@ Manual.  It corresponds to Emacs Version 19.29.
 @c than the foobar edition").  --mew 13sep93
 
 Published by the Free Software Foundation
-59 Temple Place, Suite 330
-Boston, MA  02111-1307 USA
-
-Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
-
-@ignore
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries copying permission notice
-identical to this one except for the removal of this paragraph (this
-paragraph not being relevant to the printed manual).
-
-@end ignore
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation
-approved by the Foundation.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also that the
-section entitled ``GNU General Public License'' is included exactly as
-in the original, and provided that the entire resulting derived work is
-distributed under the terms of a permission notice identical to this
-one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that the section entitled ``GNU General Public License'' may be
-included in a translation approved by the Free Software Foundation
-instead of in the original English.
+51 Franklin Street, Fifth Floor
+Boston, MA  02110-1301 USA
 @end ifinfo
 
 @setchapternewpage odd
@@ -201,8 +174,8 @@ ISBN 1-882114-71-X
 
 @sp 2
 Published by the Free Software Foundation @*
-59 Temple Place, Suite 330 @*
-Boston, MA  02111-1307 USA
+51 Franklin Street, Fifth Floor @*
+Boston, MA  02110-1301 USA
 
 @sp 1
 Permission is granted to make and distribute verbatim copies of this
@@ -286,7 +259,6 @@ Manual, corresponding to GNU Emacs version 19.29.
                               variables, and other such things.
 * Display::                Parameters controlling screen usage.
                               The bell.  Waiting for input.
-* Calendar::               Customizing the calendar and diary.
 
 Appendices
 
@@ -1017,7 +989,6 @@ Object Internals
 @include processes.texi
 @include os.texi
 @include display.texi
-@include calendar.texi
 
 @c MOVE to Emacs Manual:  include misc-modes.texi
 
@@ -1044,3 +1015,7 @@ Object Internals
 
 \f
 These words prevent "local variables" above from confusing Emacs.
+
+@ignore
+   arch-tag: dfdbecf8-fec2-49c1-8427-3e8ac8b0b849
+@end ignore