Merge changes from emacs-23 branch

[gnu-emacs] / doc / misc / ChangeLog

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 61e05aaf33262b0fffe7391ca8b3959470618c40..71de76e4d910fe8cb6944cfe8a3827d1b29d6089 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,11 @@
+2011-02-12  Glenn Morris  <rgm@gnu.org>
+
+       * sc.texi (Getting Connected): Remove old index entries.
+
+2011-02-12  Ulrich Mueller <ulm@gentoo.org>
+
+       * url.texi: Remove duplicate @dircategory (Bug#7942).
+
 2011-02-09  Paul Eggert  <eggert@cs.ucla.edu>
 
        * texinfo.tex: Update to version 2011-02-07.16.