merge emacs-23

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 63de0aafc0768a0dd259d92a357ffa4ce793643d..b5a5c7006881f62191c830f669c25cb7efbd41c4 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,27 @@
+2010-09-14  Glenn Morris  <rgm@gnu.org>
+
+       * cal-xtra.texi (Fancy Diary Display): Emphasize that sort should be
+       the last hook item.
+
+       * calendar.texi (Appointments): Also updated when a diary include file
+       is saved.
+
+2010-09-12  Glenn Morris  <rgm@gnu.org>
+
+       * trouble.texi (Bugs): Update the section intro.
+       (Known Problems): New section.
+       (Checklist): Misc updates.  Prefer M-x report-emacs-bug.
+       (Sending Patches): Bug fixes are best as responses to existing bugs.
+       * emacs.texi (Known Problems): Add menu entry for new section.
+
+2010-09-04  Chong Yidong  <cyd@stupidchicken.com>
+
+       * dired.texi (Dired Enter): Minor doc fix (Bug#6982).
+
+2010-09-02  Glenn Morris  <rgm@gnu.org>
+
+       * misc.texi (Saving Emacs Sessions): Mention desktop-path.  (Bug#6948)
+
 2010-08-21  Glenn Morris  <rgm@gnu.org>
 
        * misc.texi (Amusements): Mention bubbles and animate.
@@ -123,7 +147,7 @@
 
        * custom.texi (Init Examples): Add xref to Mail Header.
 
-       * emacs.texi (Top):  Fix xrefs.
+       * emacs.texi (Top): Fix xrefs.
 
 2010-03-25  Chong Yidong  <cyd@stupidchicken.com>