(Top): Update menu for cal-xtra node changes.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 8a3ed7e5ea771d21121781c9180ff564abc98eb7..80200a9daaba7bffcca55f9cc3eb91252af41a29 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,18 @@
+2009-12-05  Glenn Morris  <rgm@gnu.org>
+
+       Update calendar sections for fancy diary display being the default.
+       * emacs.texi (Top): Update menu for cal-xtra node changes.
+       * calendar.texi (Displaying the Diary): Holidays may be in the buffer
+       or mode line.  Don't mention invisible text or the details of
+       diary-print-entries here, only in cal-xtra.
+       (Format of Diary File): Mention that the "date on first line" format
+       only really affects the simple display.
+       * cal-xtra.texi (Advanced Calendar/Diary Usage): Update menu.
+       (Diary Customizing): Holidays may be in the buffer or mode line.
+       Move diary-print-entries to the "Diary Display" section.
+       (Diary Display): New section, split out from "Fancy Diary Display".
+       Explain the limitations of simple display, and how to print it.
+
 2009-11-29  Juri Linkov  <juri@jurta.org>
 
        * display.texi (Highlight Interactively): Actually a list of

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index a731d513c8348f4a804026d1f0e2061ac981240f..c509457f5d28b6647ead1487c0c6317cfebb61b7 100644 (file)
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -998,9 +998,9 @@ Customizing the Calendar and Diary
 * Time Display Format::    Changing the format.
 * Diary Customizing::      Defaults you can set.
 * Non-Gregorian Diary::    Diary entries based on other calendars.
-* Fancy Diary Display::    Enhancing the diary display, sorting entries,
-                             using included diary files.
-* Sexp Diary Entries::     Fancy things you can do.
+* Diary Display::          A choice of ways to display the diary.
+* Fancy Diary Display::    Sorting diary entries, using included diary files.
+* Sexp Diary Entries::     More flexible diary entries.
 
 Document Viewing