Merge from emacs-23; up to 2010-06-16T23:27:20Z!jay.p.belanger@gmail.com.

[gnu-emacs] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 807313c8632f691523ad44288bf51015b7c37203..0924bbcecc851ab5c6fc4d9cff2f6bad3c111023 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,13 @@
+2011-07-06  Chong Yidong  <cyd@stupidchicken.com>
+
+       * customize.texi (Composite Types): Move alist and plist to here
+       from Simple Types (Bug#7545).
+
+       * elisp.texi (Top): Update menu description.
+
+       * display.texi (Face Attributes): Document negative line widths
+       (Bug#6113).
+
 2011-07-03  Tobias C. Rittweiler  <tcr@freebits.de>  (tiny change)
 
        * searching.texi (Match Data): Note that match data can be