(Format of Diary File): Mention diary-nonmarking-symbol.

(Adding to Diary): Adapt for changed node name.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index e74b7516e37c0dca7b223dad25448e03f37c7422..b7171fa5d166fe09a1a87e2fdf82bf84ba94f8f7 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,27 @@
+2008-08-27  Glenn Morris  <rgm@gnu.org>
+
+       * cal-xtra.texi (Advanced Calendar/Diary Usage): Tweak some menu
+       descriptions.
+       (Calendar Customizing): Tweak layout description.
+       Move calenday-today-marker and calendar-today face to the other
+       markers.  Condense calendar-star-date and calendar-mark-today
+       description.
+       (Holiday Customizing): Add oriental and solar holidays.
+       Add index entries for Baha'i, Christian, Hebrew and Islamic holidays.
+       Fix holiday-float description.  Use zerop in examples.  Be less verbose.
+       (Date Display Format): Change ISO format.  Be less verbose.
+       (Diary Customizing): Mention day and month abbrev arrays.
+       Mention the date-form variables by name.  Update European example.
+       (Non-Gregorian Diary): Change node name.  Mention Baha'i functions.
+       Condense examples.  Mention diary-entry-symbols by name.
+       Condense table for insertion commands.
+       (Fancy Diary Display): Mention diary-include-string and
+       diary-sexp-entry-symbol.  Condense example.  Add Chinese, Coptic,
+       Ethiopic, Persian date functions.  Condense descriptions.
+
+       * calendar.texi (Format of Diary File): Mention diary-nonmarking-symbol.
+       (Adding to Diary): Adapt for changed node name.
+
 2008-08-26  Glenn Morris  <rgm@gnu.org>
 
        * cal-xtra.texi (Non-Gregorian Diary Entries): New name for

diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index 6f2175f6babcfd427d5fc1e69f5ab80c869267f6..83351d6fa33532ac5467669ea03074bf0bda6cdd 100644 (file)
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -1170,12 +1170,14 @@ first must begin with whitespace to indicate they continue a previous
 entry.  Lines that do not begin with valid dates and do not continue a
 preceding entry are ignored.
 
+@vindex diary-nonmarking-symbol
   You can inhibit the marking of certain diary entries in the calendar
-window; to do this, insert an ampersand (@samp{&}) at the beginning of
-the entry, before the date.  This has no effect on display of the entry
-in the diary window; it affects only marks on dates in the calendar
-window.  Nonmarking entries are especially useful for generic entries
-that would otherwise mark many different dates.
+window; to do this, insert an ampersand @code{diary-nonmarking-symbol}
+(default @samp{&}) at the beginning of the entry, before the date.  This
+has no effect on display of the entry in the diary window; it affects
+only marks on dates in the calendar window.  Nonmarking entries are
+especially useful for generic entries that would otherwise mark many
+different dates.
 
   If the first line of a diary entry consists only of the date or day
 name with no following blanks or punctuation, then the diary window
@@ -1279,10 +1281,10 @@ entries.  The basic commands are listed here; more sophisticated
 commands are in the next section (@pxref{Special Diary Entries}).
 Entries can also be based on non-Gregorian calendars.
 @iftex
-@inforef{Non-Gregorian Diary Entries,, emacs-xtra}.
+@inforef{Non-Gregorian Diary,, emacs-xtra}.
 @end iftex
 @ifnottex
-@xref{Non-Gregorian Diary Entries}.
+@xref{Non-Gregorian Diary}.
 @end ifnottex
 
 @table @kbd