[Emacs-diffs] Changes to emacs/man/ChangeLog

[Glenn Morris]

Index: emacs/man/ChangeLog
diff -c emacs/man/ChangeLog:1.505 emacs/man/ChangeLog:1.506
*** emacs/man/ChangeLog:1.505   Sat Mar 26 19:47:28 2005
--- emacs/man/ChangeLog Sat Mar 26 19:49:02 2005
***************
*** 11,18 ****
        mark-diary-entries-in-calendar, mark-holidays-in-calendar to main
        Emacs Manual.
        (Appt Customizing): Merge entire section into main Emacs Manual.
!       * calendar.texi: Update and reformat copyright.
!       (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.
--- 11,17 ----
        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.