Merge from emacs-23

[gnu-emacs] / doc / misc / ChangeLog

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 21835c82f67fd4a08297c9d4997089ff0488a3ed..f9e55ffb5ee669ade049cd999061121d071f7a69 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -2,6 +2,14 @@
 
        * gnus.texi (Misc Article): Document gnus-inhibit-images.
 
+2010-11-17  Glenn Morris  <rgm@gnu.org>
+
+       * edt.texi: Remove information about Emacs 19.
+
+2010-11-17  Michael Albinus  <michael.albinus@gmx.de>
+
+       * trampver.texi: Update release number.
+
 2010-11-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus.texi (Article Washing): Fix typo.