(Fancy Diary Display): Simplify.

2 files changed, 12 insertions, 15 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 97bb760822c..3fa435b8db8 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-31  Glenn Morris  <rgm@gnu.org>
+
+        * cal-xtra.texi (Fancy Diary Display): Simplify.
+
 2008-05-30  Glenn Morris  <rgm@gnu.org>
 
         * cal-xtra.texi (Fancy Diary Display): Update for
diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi
index 1f543f6f0a0..1d472cdacff 100644
--- a/doc/emacs/cal-xtra.texi
+++ b/doc/emacs/cal-xtra.texi
@@ -528,25 +528,18 @@ diary entry.
 @subsection Fancy Diary Display
 @vindex diary-display-function
 @findex diary-simple-display
+@findex diary-fancy-display
+@cindex diary buffer
 
   Diary display works by preparing the diary buffer and then running the
 function specified by the variable @code{diary-display-function}.  The
 default value (@code{diary-simple-display}) hides the irrelevant diary
-entries and then displays the buffer.  However, if you set the variable
-as follows,
-
-@cindex diary buffer
-@findex diary-fancy-display
-@example
-(setq diary-display-function 'diary-fancy-display)
-@end example
-
-@noindent
-this enables fancy diary display.  It displays diary entries and
-holidays by copying them into a special buffer that exists only for the
-sake of display.  Copying to a separate buffer provides an opportunity
-to change the displayed text to make it prettier---for example, to sort
-the entries by the dates they apply to.
+entries and then displays the buffer.  The alternative
+@code{diary-fancy-display} displays diary entries and holidays by
+copying them into a special buffer that exists only for the sake of
+display.  Copying to a separate buffer provides an opportunity to change
+the displayed text to make it prettier---for example, to sort the
+entries by the dates they apply to.
 
   As with simple diary display, you can print a hard copy of the buffer
 with @code{diary-print-entries}.  To print a hard copy of a day-by-day