summaryrefslogtreecommitdiff
path: root/doc/emacs/calendar.texi
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-10-08 00:00:24 -0700
committerGlenn Morris <rgm@gnu.org>2012-10-08 00:00:24 -0700
commitb859a3833a3eaa13b81ffba18812c38ab023de9f (patch)
treeb27631b88a93511273b90fd91e862f7a732decae /doc/emacs/calendar.texi
parente499e60744fbb692201564743fc9859fa63a1196 (diff)
downloademacs-b859a3833a3eaa13b81ffba18812c38ab023de9f.tar.gz
Document cal-html-holidays
* doc/emacs/calendar.texi (Writing Calendar Files): Mention cal-html-holidays. * etc/NEWS: Related edit.
Diffstat (limited to 'doc/emacs/calendar.texi')
-rw-r--r--doc/emacs/calendar.texi11
1 files changed, 6 insertions, 5 deletions
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