merge emacs-23

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index af408d44a399284e396c1d4019a286f3dd81c9e2..b5a5c7006881f62191c830f669c25cb7efbd41c4 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,8 @@
 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.
 
@@ -144,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>