Merge from emacs-23

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 2b9b81d2bd8279e1b60259e8665475c189bf0b9e..e954fe496c4ee952cc60d5a20d304717d3579b42 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-10  Glenn Morris  <rgm@gnu.org>
+
+       * basic.texi (Inserting Text): Minor clarification.  (Bug#6374)
+
+       * basic.texi (Inserting Text): Fix typo.
+
 2010-06-10  Glenn Morris  <rgm@gnu.org>
 
        * ack.texi (Acknowledgments):