From: Glenn Morris Date: Mon, 8 Oct 2012 07:00:24 +0000 (-0700) Subject: Document cal-html-holidays X-Git-Tag: emacs-24.2.90~237^2~68 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b859a3833a3eaa13b81ffba18812c38ab023de9f;p=emacs.git 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 067574b9a0d..4938ae193a8 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2012-10-08 Glenn Morris + + * calendar.texi (Writing Calendar Files): Mention cal-html-holidays. + 2012-10-06 Glenn Morris * 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 diff --git a/etc/NEWS b/etc/NEWS index 1a7eb82967d..cd8be6fe2e8 100644 --- 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