# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1234165844 0
# Node ID 459248f6207e9d5230d574a2696d18374cc40240
# Parent  2c5d675b218e1f05db6ee4713f3856b779b9010d
(Holidays, Displaying the Diary): Update for new marker defaults.

diff -r 2c5d675b218e -r 459248f6207e doc/emacs/ChangeLog
--- a/doc/emacs/ChangeLog	Mon Feb 09 03:05:50 2009 +0000
+++ b/doc/emacs/ChangeLog	Mon Feb 09 07:50:44 2009 +0000
@@ -1,3 +1,8 @@
+2009-02-09  Glenn Morris  <rgm@gnu.org>
+
+	* calendar.texi (Holidays, Displaying the Diary): Update for new marker
+	defaults.
+
 2009-02-07  Eli Zaretskii  <eliz@gnu.org>
 
 	* rmail.texi (Rmail Coding) <rmail-redecode-body>: Remove stale
diff -r 2c5d675b218e -r 459248f6207e doc/emacs/calendar.texi
--- a/doc/emacs/calendar.texi	Mon Feb 09 03:05:50 2009 +0000
+++ b/doc/emacs/calendar.texi	Mon Feb 09 07:50:44 2009 +0000
@@ -488,8 +488,7 @@
 @vindex calendar-mark-holidays-flag
   To view the distribution of holidays for all the dates shown in the
 calendar, use the @kbd{x} command.  This displays the dates that are
-holidays in a different face (or places a @samp{*} after these dates, if
-a color display is not available, or if @code{font-lock-mode} is off).
+holidays in a different face.
 @iftex
 @inforef{Calendar Customizing, calendar-holiday-marker, emacs-xtra}.
 @end iftex
@@ -1095,8 +1094,7 @@
 @vindex calendar-mark-diary-entries-flag
   To get a broader view of which days are mentioned in the diary, use
 the @kbd{m} command.  This displays the dates that have diary entries in
-a different face (or places a @samp{+} after these dates, if display
-with multiple faces is not available).
+a different face.
 @iftex
 @inforef{Calendar Customizing, diary-entry-marker, emacs-xtra}.
 @end iftex