changeset 106937:bb56b4800dcb

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 17 Jan 2010 23:32:40 +0000
parents d8549f97592e (current diff) 516a1600b276 (diff)
children cfd4986edb0b
files
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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