Merge changes from emacs-23 branch

[gnu-emacs] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index be8803d4cb24158e3a6381c35434529d90ad8628..063ea78c09a2a6fad88cbf23cc8342e3c0d09065 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-28  Chong Yidong  <cyd@stupidchicken.com>
+
+       * vol1.texi (Top):
+       * vol2.texi (Top):
+       * elisp.texi (Top):
+       * display.texi (Display Property): Shorten the menu description of
+       the "Other Display Specs" node (Bug#7816).
+
+       * keymaps.texi (Defining Menus): Add "menu item" and "extended
+       menu item" concept index entries (Bug#7805).
+
 2011-01-29  Eli Zaretskii  <eliz@gnu.org>
 
        * makefile.w32-in (texinfodir): New variable.