[Emacs-diffs] Changes to emacs/man/calendar.texi

[Glenn Morris]

Index: emacs/man/calendar.texi
diff -c emacs/man/calendar.texi:1.31 emacs/man/calendar.texi:1.32
*** emacs/man/calendar.texi:1.31        Sat Mar 26 19:51:24 2005
--- emacs/man/calendar.texi     Sat Mar 26 20:13:31 2005
***************
*** 25,32 ****
  the calendar, type @kbd{q}.
  
  The basic features of the Calendar/Diary are described here.
! @xref{Advanced Calendar/Diary Usage,,, emacs-xtra, Specialized Emacs
! Features}, for information about more specialized features.
  
  @menu
  * Calendar Motion::     Moving through the calendar; selecting a date.
--- 25,32 ----
  the calendar, type @kbd{q}.
  
  The basic features of the Calendar/Diary are described here.
! @inforef{Advanced Calendar/Diary Usage,, emacs-xtra}, for information
! about more specialized features.
  
  @menu
  * Calendar Motion::     Moving through the calendar; selecting a date.
***************
*** 443,456 ****
    To view the distribution of holidays for all the dates shown in the
  calendar, use the @kbd{x} command.  This displays the dates that are
  holidays in a different face (or places a @samp{*} after these dates, if
! display with multiple faces is not available).  @xref{Calendar
! Customizing,, calendar-holiday-marker, emacs-xtra, Specialized Emacs
! Features}.  The command applies both to the currently visible months and
! to other months that subsequently become visible by scrolling.  To turn
! marking off and erase the current marks, type @kbd{u}, which also erases
! any diary marks (@pxref{Diary}).  If the variable
! @code{mark-holidays-in-calendar} is address@hidden, holidays are marked
! in the calendar when it is created (or recomputed).
  
  
  @kindex a @r{(Calendar mode)}
--- 443,456 ----
    To view the distribution of holidays for all the dates shown in the
  calendar, use the @kbd{x} command.  This displays the dates that are
  holidays in a different face (or places a @samp{*} after these dates, if
! display with multiple faces is not available).  @inforef{Calendar
! Customizing, calendar-holiday-marker, emacs-xtra}.  The command applies
! both to the currently visible months and to other months that
! subsequently become visible by scrolling.  To turn marking off and erase
! the current marks, type @kbd{u}, which also erases any diary marks
! (@pxref{Diary}).  If the variable @code{mark-holidays-in-calendar} is
! address@hidden, holidays are marked in the calendar when it is created
! (or recomputed).
  
  
  @kindex a @r{(Calendar mode)}
***************
*** 1019,1032 ****
    To get a broader view of which days are mentioned in the diary, use
  the @kbd{m} command.  This displays the dates that have diary entries in
  a different face (or places a @samp{+} after these dates, if display
! with multiple faces is not available).  @xref{Calendar Customizing,,
! diary-entry-marker, emacs-xtra, Specialized Emacs Features}.  The
! command applies both to the currently visible months and to other months
! that subsequently become visible by scrolling.  To turn marking off and
! erase the current marks, type @kbd{u}, which also turns off holiday
! marks (@pxref{Holidays}).  If the variable
! @code{mark-diary-entries-in-calendar} is address@hidden, diary dates are
! marked in the calendar when it is created (or recomputed).
  
  @kindex s @r{(Calendar mode)}
  @findex show-all-diary-entries
--- 1019,1032 ----
    To get a broader view of which days are mentioned in the diary, use
  the @kbd{m} command.  This displays the dates that have diary entries in
  a different face (or places a @samp{+} after these dates, if display
! with multiple faces is not available).  @inforef{Calendar Customizing,
! diary-entry-marker, emacs-xtra}.  The command applies both to the
! currently visible months and to other months that subsequently become
! visible by scrolling.  To turn marking off and erase the current marks,
! type @kbd{u}, which also turns off holiday marks (@pxref{Holidays}).  If
! the variable @code{mark-diary-entries-in-calendar} is address@hidden,
! diary dates are marked in the calendar when it is created (or
! recomputed).
  
  @kindex s @r{(Calendar mode)}
  @findex show-all-diary-entries
***************
*** 1047,1055 ****
    The command @kbd{M-x diary} displays the diary entries for the current
  date, independently of the calendar display, and optionally for the next
  few days as well; the variable @code{number-of-diary-entries} specifies
! how many days to include.  @xref{Advanced Calendar/Diary Usage,
! Customizing the Calendar and Diary,, emacs-xtra, Specialized Emacs
! Features}.
  
    If you put @code{(diary)} in your @file{.emacs} file, this
  automatically displays a window with the day's diary entries, when you
--- 1047,1053 ----
    The command @kbd{M-x diary} displays the diary entries for the current
  date, independently of the calendar display, and optionally for the next
  few days as well; the variable @code{number-of-diary-entries} specifies
! how many days to include.  @inforef{Diary Customizing,, emacs-xtra}.
  
    If you put @code{(diary)} in your @file{.emacs} file, this
  automatically displays a window with the day's diary entries, when you
***************
*** 1354,1361 ****
  specifying the name of a face or a single-character string to use when
  marking the entry in the calendar.  Most generally, sexp diary entries
  can perform arbitrary computations to determine when they apply.
! @xref{Sexp Diary Entries,, Sexp Diary Entries, emacs-xtra, Specialized
! Emacs Features}.
  
  @node Appointments
  @section Appointments
--- 1352,1358 ----
  specifying the name of a face or a single-character string to use when
  marking the entry in the calendar.  Most generally, sexp diary entries
  can perform arbitrary computations to determine when they apply.
! @inforef{Sexp Diary Entries,, emacs-xtra}.
  
  @node Appointments
  @section Appointments
***************
*** 1474,1481 ****
  
  @noindent
  You can use an @code{#include} directive to add the import file contents
! to the main diary file, if these are distinct.  @xref{Fancy Diary
! Display,,, emacs-xtra, Specialized Emacs Features}.
  
  @findex icalendar-export-file, icalendar-export-region
    Use @code{icalendar-export-file} to interactively export an entire
--- 1471,1478 ----
  
  @noindent
  You can use an @code{#include} directive to add the import file contents
! to the main diary file, if these are distinct.  @inforef{Fancy Diary
! Display,, emacs-xtra}.
  
  @findex icalendar-export-file, icalendar-export-region
    Use @code{icalendar-export-file} to interactively export an entire