[Emacs-diffs] /srv/bzr/emacs/trunk r110437: Document cal-html-holidays

[Glenn Morris]

------------------------------------------------------------
revno: 110437
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-08 00:00:24 -0700
message:
  Document cal-html-holidays
  
  * doc/emacs/calendar.texi (Writing Calendar Files): Mention cal-html-holidays.
  
  * etc/NEWS: Related edit.
modified:
  doc/emacs/ChangeLog
  doc/emacs/calendar.texi
  etc/NEWS

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-10-06 18:34:23 +0000
+++ b/doc/emacs/ChangeLog       2012-10-08 07:00:24 +0000
@@ -1,3 +1,7 @@
+2012-10-08  Glenn Morris  <address@hidden>
+
+       * calendar.texi (Writing Calendar Files): Mention cal-html-holidays.
+
 2012-10-06  Glenn Morris  <address@hidden>
 
        * calendar.texi (Writing Calendar Files): Tweak week descriptions.

=== modified file 'doc/emacs/calendar.texi'
--- a/doc/emacs/calendar.texi   2012-10-06 18:34:23 +0000
+++ b/doc/emacs/calendar.texi   2012-10-08 07:00:24 +0000
@@ -349,11 +349,12 @@
 
 @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 @address@hidden@var{mm}.html}, where @var{yyyy} and
address@hidden 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 @address@hidden@var{mm}.html}, where
address@hidden 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

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-10-07 10:07:23 +0000
+++ b/etc/NEWS  2012-10-08 07:00:24 +0000
@@ -286,8 +286,9 @@
 +++
 *** 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