diff man/emacs.texi @ 83560:738ce3540ffb

Merged from [e-mail] Patches applied: * [e-mail]/emacs--devo--0--patch-660 Update from CVS * [e-mail]/emacs--devo--0--patch-661 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-662 Update from CVS * [e-mail]/emacs--devo--0--patch-663 Update from CVS * [e-mail]/emacs--devo--0--patch-664 Update from CVS * [e-mail]/emacs--devo--0--patch-665 Update from CVS * [e-mail]/emacs--devo--0--patch-666 Fix read-only prompt problem in isearch * [e-mail]/emacs--devo--0--patch-667 Update from CVS * [e-mail]/emacs--devo--0--patch-668 Update from CVS * [e-mail]/emacs--devo--0--patch-669 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-670 Update from CVS * [e-mail]/emacs--devo--0--patch-671 Update from CVS * [e-mail]/emacs--devo--0--patch-672 Update from CVS * [e-mail]/emacs--devo--0--patch-673 Update from CVS * [e-mail]/gnus--rel--5.10--patch-206 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-207 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-208 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-600

--- a/man/emacs.texi	Sun Apr 22 11:42:03 2007 +0000
+++ b/man/emacs.texi	Sun Apr 22 12:12:29 2007 +0000
@@ -5,7 +5,7 @@
 
 @c The edition number appears in several places in this file
 @set EDITION   Sixteenth
-@set EMACSVER  22.0.95
+@set EMACSVER  22.0.96
 
 @copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
@@ -812,7 +812,7 @@
 * Diary::               Displaying events from your diary.
 * Appointments::	Reminders when it's time to do something.
 * Importing Diary::     Converting diary events to/from other formats.
-* Daylight Savings::    How to specify when daylight savings time is active.
+* Daylight Saving::    How to specify when daylight saving time is active.
 * Time Intervals::      Keeping track of time intervals.
 * Advanced Calendar/Diary Usage:: Advanced Calendar/Diary customization.