Merge changes from emacs-23 branch

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

diff --git a/doc/emacs/gnu.texi b/doc/emacs/gnu.texi
index 84e6e435db7f6fcaa15c9565e9dad475e96ce623..dfdeedd65ec347613b89ffea3273abcccb6ad85e 100644 (file)
--- a/doc/emacs/gnu.texi
+++ b/doc/emacs/gnu.texi
@@ -1,5 +1,5 @@
-@c Copyright (C) 1985, 1986, 1987, 1993, 1995, 2001, 2002, 2003, 2004,
-@c   2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+@c Copyright (C) 1985-1987, 1993, 1995, 2001-2011
+@c   Free Software Foundation, Inc.
 @c
 @c Permission is granted to anyone to make or distribute verbatim copies
 @c of this document, in any medium, provided that the copyright notice and
@@ -549,7 +549,3 @@ this are bureaucracy and isometric struggles against competition.  Free
 software will greatly reduce these drains in the area of software
 production.  We must do this, in order for technical gains in productivity
 to translate into less work for us.
-
-@ignore
-   arch-tag: 21eb38f8-6fa0-480a-91cd-f3dab7148542
-@end ignore