From: Karl Berry <karl@gnu.org>
Date: Tue, 21 Jun 2005 18:39:14 +0000 (+0000)
Subject: @copying
X-Git-Tag: emacs-pretest-22.0.90~8750
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9d7d543c3127ee1e90e319412d7f31da7a658855;p=emacs.git

@copying
---

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index d87ce0b249a..7e99d294555 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,5 +1,7 @@
 2005-06-21  Karl Berry  <karl@gnu.org>
 
+	* elisp.texi: Use @copying.
+
 	* elisp.texi: Put @summarycontents and @contents before the Top
 	node, instead of the end of the file, so that the contents appear
 	in the right place in the dvi/pdf output.
diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index cd92b683478..9e52b39223e 100644
--- a/lispref/elisp.texi
+++ b/lispref/elisp.texi
@@ -26,29 +26,27 @@
 @c We use the "type index" to index new functions and variables.
 @c @syncodeindex tp fn
 
-@ifnottex
-This Info file contains edition @value{VERSION} of the GNU Emacs Lisp
+@copying
+This is edition @value{VERSION} of the GNU Emacs Lisp
 Reference Manual, corresponding to Emacs version @value{EMACSVER}.
 
-Published by the Free Software Foundation
-59 Temple Place, Suite 330
-Boston, MA  02111-1307  USA
-
-Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, @*
+Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999,
               2000, 2002, 2003, 2004, 2005, 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.1 or
 any later version published by the Free Software Foundation; with the
-Invariant Sections being ``GNU General Public License'', 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''.
+Invariant Sections being ``GNU General Public License'', 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 freedom to copy and modify
 this GNU Manual, like GNU software.  Copies published by the Free
 Software Foundation raise funds for GNU development.''
-@end ifnottex
+@end quotation
+@end copying
 
 @titlepage
 @title GNU Emacs Lisp Reference Manual
@@ -59,33 +57,16 @@ Software Foundation raise funds for GNU development.''
 @author and the GNU Manual Group
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,@*
-1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-@sp 2
-Edition @value{VERSION} @*
-Revised for Emacs Version @value{EMACSVER},@*
-January 2002.@*
-@sp 2
-ISBN 1-882114-73-6
+@insertcopying
 
-@sp 2
+@sp 1
 Published by the Free Software Foundation @*
-59 Temple Place, Suite 330@*
-Boston, MA  02111-1307  USA
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``Copying'', 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 freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
+51 Franklin St, Fifth Floor @*
+Boston, MA 02110-1301 @*
+USA @*
+ISBN 1-882114-73-6
 
+@sp 1
 Cover art by Etienne Suvasa.
 @end titlepage