2 files changed, 15 insertions, 6 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 287c095a473..6b3b8d251e9 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-24  Glenn Morris  <rgm@gnu.org>
+
+        * calendar.texi (Writing Calendar Files): cal-tex-diary etc only work
+        for some calendars.
+
 2007-07-13  Eli Zaretskii  <eliz@gnu.org>
 
         * Makefile.in (../info/emacs-mime): Use --enable-encoding.
diff --git a/man/calendar.texi b/man/calendar.texi
index 58ca24af7d9..5182474622d 100644
--- a/man/calendar.texi
+++ b/man/calendar.texi
@@ -432,12 +432,16 @@ argument which specifies how many days, weeks, months or years to print
   If the variable @code{cal-tex-holidays} is non-@code{nil} (the default),
 then the printed calendars show the holidays in @code{calendar-holidays}.
 If the variable @code{cal-tex-diary} is non-@code{nil} (the default is
-@code{nil}), diary entries are included also (in weekly and monthly
-calendars only).  If the variable @code{cal-tex-rules} is non-@code{nil}
-(the default is @code{nil}), the calendar displays ruled pages
-in styles that have sufficient room.  You can use the variable
-@code{cal-tex-preamble-extra} to insert extra La@TeX{} commands in the
-preamble of the generated document if you need to.
+@code{nil}), diary entries are included also (in monthly, filofax, and
+iso-week calendars only).  If the variable @code{cal-tex-rules} is
+non-@code{nil} (the default is @code{nil}), the calendar displays ruled
+pages in styles that have sufficient room.  Consult the documentation of
+the individual cal-tex functions to see which calendars support which
+features.
+
+  You can use the variable @code{cal-tex-preamble-extra} to insert extra
+La@TeX{} commands in the preamble of the generated document if you need
+to.
 
 @node Holidays
 @section Holidays