Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.

[gnu-emacs] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7ef3be46b68c980957d79208505957956241b39c..3a66cebce2a063e14fad923dfc8c27f8e6ae6983 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,15 @@
+2011-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * modes.texi (Region to Refontify): Rename from "Region to Fontify".
+       (Multiline Font Lock):
+       * vol2.texi (Top):
+       * vol1.texi (Top):
+       * elisp.texi (Top): Update menu accordingly.
+
+2011-05-12  Drew Adams  <drew.adams@oracle.com>
+
+       * modes.texi (Region to Fontify): Fix typo.
+
 2011-05-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        * numbers.texi (Integer Basics): Large integers are treated as floats.