From: Glenn Morris Date: Sat, 26 Mar 2005 19:49:02 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: ttn-vms-21-2-B4~1470 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0bd1a9c8d06eac99c283c029e2025fc7dc93d2d4;p=emacs.git *** empty log message *** --- diff --git a/man/ChangeLog b/man/ChangeLog index fd283299653..7ec2bc7bb0a 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -6,6 +6,24 @@ (Special Diary Entries, Importing Diary): Change some xrefs to point to emacs-xtra rather than elisp. + * emacs-xtra.texi (Calendar Customizing): Move + view-diary-entries-initially, view-calendar-holidays-initially, + mark-diary-entries-in-calendar, mark-holidays-in-calendar to main + Emacs Manual. + (Appt Customizing): Merge entire section into main Emacs Manual. + * calendar.texi (Holidays): Move view-calendar-holidays-initially, + mark-holidays-in-calendar here from emacs-xtra. + (Displaying the Diary): Move view-diary-entries-initially, + mark-diary-entries-in-calendar here from emacs-xtra. + (Appointments): Move appt-display-mode-line, + appt-display-duration, appt-disp-window-function, + appt-delete-window-function here from emacs-xtra. + + * calendar.texi: Update and reformat copyright. + (Calendar/Diary): Menu now only on Mouse-3, not C-Mouse-3. + (Diary): Refer to `diary-file' rather than ~/diary. + (Diary Commands): Rename node to "Displaying the Diary". + 2005-03-26 Eli Zaretskii * misc.texi (Emacs Server): Fix the command for setting