# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1263771160 0
# Node ID bb56b4800dcb6e7e7fdd09f83265529eb4e8d21e
# Parent  d8549f97592e74ac6191d75212134135d1eb561f# Parent  516a1600b27656d4b90a71dcf2d7115423378027
Merge from mainline.

diff -r d8549f97592e -r bb56b4800dcb doc/lispref/ChangeLog
--- a/doc/lispref/ChangeLog	Sun Jan 17 21:57:00 2010 +0000
+++ b/doc/lispref/ChangeLog	Sun Jan 17 23:32:40 2010 +0000
@@ -1,3 +1,7 @@
+2010-01-17  Chong Yidong  <cyd@stupidchicken.com>
+
+	* elisp.texi: Remove duplicate edition information (Bug#5407).
+
 2010-01-17  Juanma Barranquero  <lekktu@gmail.com>
 
 	* two.el (volume-header-toc-markup): Fix typos in docstring.
diff -r d8549f97592e -r bb56b4800dcb doc/lispref/elisp.texi
--- a/doc/lispref/elisp.texi	Sun Jan 17 21:57:00 2010 +0000
+++ b/doc/lispref/elisp.texi	Sun Jan 17 23:32:40 2010 +0000
@@ -100,9 +100,6 @@
 @node Top, Introduction, (dir), (dir)
 @top Emacs Lisp
 
-This Info file contains edition @value{VERSION} of the GNU Emacs Lisp
-Reference Manual, corresponding to GNU Emacs version @value{EMACSVER}.
-
 @insertcopying
 @end ifnottex