Document cal-html-holidays

* doc/emacs/calendar.texi (Writing Calendar Files): Mention cal-html-holidays.

* etc/NEWS: Related edit.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 067574b9a0df3cddab861712507e6c1a321f570e..4938ae193a83ee84924ac11d88fd2e074fa8dd45 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-08  Glenn Morris  <rgm@gnu.org>
+
+       * calendar.texi (Writing Calendar Files): Mention cal-html-holidays.
+
 2012-10-06  Glenn Morris  <rgm@gnu.org>
 
        * calendar.texi (Writing Calendar Files): Tweak week descriptions.

diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index d46e26cddcf908189bf02906b13b5e6fd4977c96..d1ddd0dce90728ce70dc78c8056467d2c8078666 100644 (file)
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -349,11 +349,12 @@ calendar deletes or iconifies that frame depending on the value of
 
 @cindex calendar and HTML
   The Calendar HTML commands produce files of HTML code that contain
-calendar and diary entries.  Each file applies to one month, and has a
-name of the format @file{@var{yyyy}-@var{mm}.html}, where @var{yyyy} and
-@var{mm} are the four-digit year and two-digit month, respectively.  The
-variable @code{cal-html-directory} specifies the default output
-directory for the HTML files.
+calendar, holiday, and diary entries.  Each file applies to one month,
+and has a name of the format @file{@var{yyyy}-@var{mm}.html}, where
+@var{yyyy} and @var{mm} are the four-digit year and two-digit month,
+respectively.  The variable @code{cal-html-directory} specifies the
+default output directory for the HTML files.  To prevent holidays
+from being shown, customize @code{cal-html-holidays}.
 
 @vindex cal-html-css-default
   Diary entries enclosed by @code{<} and @code{>} are interpreted as

diff --git a/etc/NEWS b/etc/NEWS
index 1a7eb82967da79050f76687f3bd18f58545d371b..cd8be6fe2e8d1170dc3ec145cd5bd3bd2851bce4 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -286,8 +286,9 @@ See the variable `calendar-month-header'.
 +++
 *** New LaTeX calendar style, produced by `cal-tex-cursor-week2-summary'.
 
++++
 *** The calendars produced by cal-html include holidays.
-Customize cal-html-holidays to change this.
+Customize `cal-html-holidays' to change this.
 
 ** CL