Merge changes from emacs-24 branch

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

diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 4ed096d21a4c62482b1276caf06730d9ce40cea5..d794ddc385bdc9ceeee1ff75352d91d6626e7d33 100644 (file)
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1,8 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990-1995, 1998-2012  Free Software Foundation, Inc.
+@c Copyright (C) 1990-1995, 1998-2012 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
-@setfilename ../../info/text
 @node Text, Non-ASCII Characters, Markers, Top
 @chapter Text
 @cindex text