Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca

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

diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 18343b4dc856a8194a3563553161acec415c5110..0cdcaa84d5838229319be30578fd9b342fa06e67 100644 (file)
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1,8 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000,
-@c   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-@c   Free Software Foundation, Inc.
+@c Copyright (C) 1990-1995, 1998-2011  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../../info/variables
 @node Variables, Functions, Control Structures, Top
@@ -1931,7 +1929,3 @@ Attempting to assign them any other value will result in an error:
 (setq window-min-height 5.0)
 @error{} Wrong type argument: integerp, 5.0
 @end example
-
-@ignore
-   arch-tag: 5ff62c44-2b51-47bb-99d4-fea5aeec5d3e
-@end ignore