Document cal-html-holidays

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

* etc/NEWS: Related edit.

2 files changed, 10 insertions, 5 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 067574b9a0d..4938ae193a8 100644
--- 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 d46e26cddcf..d1ddd0dce90 100644
--- 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