--- a/man/xemacs/calendar.texi	Mon Aug 13 11:01:58 2007 +0200
+++ b/man/xemacs/calendar.texi	Mon Aug 13 11:03:08 2007 +0200
@@ -15,7 +15,7 @@
 particular date; @kbd{Buttons3} brings up a menu of commonly used
 calendar features that are independent of any particular date.  To exit
 the calendar, type @kbd{q}.  @xref{Calendar, Customizing the Calendar
-and Diary,, lispref, The XEmacs Lisp Reference Manual}, for customization
+and Diary,, elisp, The Emacs Lisp Reference Manual}, for customization
 information about the calendar and diary.
  
 @menu
@@ -194,7 +194,7 @@
 
 @kindex . @r{(Calendar mode)}
 @findex calendar-goto-today
-  You can return to today's date with @kbd{.}@:
+  You can return to today's date with @kbd{.}
 (@code{calendar-goto-today}).
 
 @node Scroll Calendar, Mark and Region, Calendar Motion, Calendar/Diary
@@ -393,7 +393,7 @@
 (@code{cal-tex-cursor-year}).
 @item t Y
 Generate a sideways-printing calendar for one year
-(@code{cal-tex-cursor-year-landscape}).
+(@code{cal-tex-cursor-landscape-year}).
 @item t f y
 Generate a Filofax-style calendar for one year
 (@code{cal-tex-cursor-filofax-year}).
@@ -480,7 +480,7 @@
 @findex list-holidays
    The command @kbd{M-x list-holidays} displays the list of holidays for
 a range of years.  This function asks you for the starting and stopping
-years, and allows you to choose all the holidays or one of several
+years, and allows you to chose all the holidays or one of several
 categories of holidays.  You can use this command even if you don't have
 a calendar window.
 
@@ -998,8 +998,6 @@
 Print hard copy of the diary display as it appears.
 @item M-x diary
 Display all diary entries for today's date.
-@item M-x diary-mail-entries
-Mail yourself email reminders about upcoming diary entries.
 @end table
 
 @kindex d @r{(Calendar mode)}
@@ -1056,14 +1054,6 @@
 enter Emacs.  The mode line of the displayed window shows the date and
 any holidays that fall on that date.
 
-@findex diary-mail-entries
-@vindex diary-mail-days
-  Many users like to receive notice of events in their diary as email.
-To send such mail to yourself, use the command @kbd{M-x
-diary-mail-entries}.  A prefix argument specifies how many days
-(starting with today) to check; otherwise, the variable
-@code{diary-mail-days} says how many days.
-
 @node Format of Diary File, Date Formats, Diary Commands, Diary
 @subsection The Diary File
 @cindex diary file
@@ -1226,6 +1216,10 @@
   All of the above commands make marking diary entries by default.  To
 make a nonmarking diary entry, give a numeric argument to the command.
 For example, @kbd{C-u i w} makes a nonmarking weekly diary entry.
+ 
+  All of the above commands make marking diary entries.  If you want the diary
+entry to be nonmarking, give a prefix argument to the command.  For example,
+@kbd{C-u i w} makes a nonmarking, weekly diary entry.
 
   When you modify the diary file, be sure to save the file before
 exiting Emacs.
@@ -1766,9 +1760,9 @@
 The values should be @code{nil} if your area does not use daylight
 savings time.
 
-  Emacs uses these expressions to determine the starting date of
-daylight savings time for the holiday list  and for correcting times of
-day in the solar and lunar calculations.
+  Emacs uses these expressions to determine the start and end dates of
+daylight savings time as holidays and for correcting times of day in the
+solar and lunar calculations.
  
   The values for Cambridge, Massachusetts are as follows:
 
@@ -1780,7 +1774,7 @@
 @end example
 
 @noindent
-That is, the first 0th day (Sunday) of the fourth month (April) in
+i.e., the first 0th day (Sunday) of the fourth month (April) in
 the year specified by @code{year}, and the last Sunday of the tenth month
 (October) of that year.  If daylight savings time were
 changed to start on October 1, you would set
@@ -1815,10 +1809,10 @@
 
 @c @vindex calendar-daylight-savings-starts-time  too long!
 @vindex calendar-daylight-savings-ends-time
-  The two variables @code{calendar-daylight-savings-starts-time} and
-@code{calendar-daylight-savings-ends-time} specify the number of minutes
-after midnight local time when the transition to and from daylight
-savings time should occur.  For Cambridge, Massachusetts both variables'
+  The variable @code{calendar-daylight-savings-starts-time} and the
+variable @code{calendar-daylight-savings-ends-time} specify the number
+of minutes after midnight local time when the transition to and from
+daylight savings time should occur.  For Cambridge, both variables'
 values are 120.
  
 @node Diary Customizing