Merge from emacs-23

[bpt/emacs.git] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index cb27533..f192d7f 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-27  Juanma Barranquero  <lekktu@gmail.com>
+
+       * modes.texi (Defining Minor Modes): Use C-delete in examples,
+       instead of "\C-\^?" (bug#6334).
+
+       * text.texi (Special Properties): Fix typo.
+
 2010-07-09  Eli Zaretskii  <eliz@gnu.org>
 
        * internals.texi (Writing Emacs Primitives): Adapt to ANSI C