Merge changes from emacs-23 branch.

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index e954fe496c4ee952cc60d5a20d304717d3579b42..487663109bde174f8ac3367c900ac505fb0604f1 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,13 @@
+2010-06-23  Glenn Morris  <rgm@gnu.org>
+
+       * abbrevs.texi, basic.texi, buffers.texi, building.texi, calendar.texi:
+       * custom.texi, dired.texi, display.texi, emacs.texi, emerge-xtra.texi:
+       * files.texi, fortran-xtra.texi, frames.texi, help.texi, killing.texi:
+       * maintaining.texi, mark.texi, mini.texi, misc.texi, msdog.texi:
+       * mule.texi, programs.texi, rmail.texi, screen.texi, search.texi:
+       * sending.texi, text.texi, trouble.texi, vc1-xtra.texi, xresources.texi:
+       Untabify Texinfo files.
+
 2010-06-10  Glenn Morris  <rgm@gnu.org>
 
        * basic.texi (Inserting Text): Minor clarification.  (Bug#6374)