aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man/calendar.texi34
1 files changed, 17 insertions, 17 deletions
diff --git a/man/calendar.texi b/man/calendar.texi
index 812bde03b2f..11b24f7c210 100644
--- a/man/calendar.texi
+++ b/man/calendar.texi
@@ -43,7 +43,7 @@ about more specialized features.
43* Diary:: Displaying events from your diary. 43* Diary:: Displaying events from your diary.
44* Appointments:: Reminders when it's time to do something. 44* Appointments:: Reminders when it's time to do something.
45* Importing Diary:: Converting diary events to/from other formats. 45* Importing Diary:: Converting diary events to/from other formats.
46* Daylight Savings:: How to specify when daylight savings time is active. 46* Daylight Saving:: How to specify when daylight saving time is active.
47* Time Intervals:: Keeping track of time intervals. 47* Time Intervals:: Keeping track of time intervals.
48@ifnottex 48@ifnottex
49* Advanced Calendar/Diary Usage:: Advanced Calendar/Diary customization. 49* Advanced Calendar/Diary Usage:: Advanced Calendar/Diary customization.
@@ -604,8 +604,8 @@ Time (Greenwich time). The values of
604@code{calendar-standard-time-zone-name} and 604@code{calendar-standard-time-zone-name} and
605@code{calendar-daylight-time-zone-name} are the abbreviations used in 605@code{calendar-daylight-time-zone-name} are the abbreviations used in
606your time zone. Emacs displays the times of sunrise and sunset 606your time zone. Emacs displays the times of sunrise and sunset
607@emph{corrected for daylight savings time}. @xref{Daylight Savings}, 607@emph{corrected for daylight saving time}. @xref{Daylight Saving},
608for how daylight savings time is determined. 608for how daylight saving time is determined.
609 609
610 As a user, you might find it convenient to set the calendar location 610 As a user, you might find it convenient to set the calendar location
611variables for your usual physical location in your @file{.emacs} file. 611variables for your usual physical location in your @file{.emacs} file.
@@ -646,9 +646,9 @@ month, use @kbd{C-u M-x phases-of-moon}, which prompts for the month and
646year. 646year.
647 647
648 The dates and times given for the phases of the moon are given in 648 The dates and times given for the phases of the moon are given in
649local time (corrected for daylight savings, when appropriate); but if 649local time (corrected for daylight saving, when appropriate); but if
650the variable @code{calendar-time-zone} is void, Coordinated Universal 650the variable @code{calendar-time-zone} is void, Coordinated Universal
651Time (the Greenwich time zone) is used. @xref{Daylight Savings}. 651Time (the Greenwich time zone) is used. @xref{Daylight Saving}.
652 652
653@node Other Calendars 653@node Other Calendars
654@section Conversion To and From Other Calendars 654@section Conversion To and From Other Calendars
@@ -1553,14 +1553,14 @@ Emacs diary file to iCalendar format. To export only a part of a diary
1553file, mark the relevant area, and call @code{icalendar-export-region}. 1553file, mark the relevant area, and call @code{icalendar-export-region}.
1554In both cases the result is appended to the target file. 1554In both cases the result is appended to the target file.
1555 1555
1556@node Daylight Savings 1556@node Daylight Saving
1557@section Daylight Savings Time 1557@section Daylight Saving Time
1558@cindex daylight savings time 1558@cindex daylight saving time
1559 1559
1560 Emacs understands the difference between standard time and daylight 1560 Emacs understands the difference between standard time and daylight
1561savings time---the times given for sunrise, sunset, solstices, 1561saving time---the times given for sunrise, sunset, solstices,
1562equinoxes, and the phases of the moon take that into account. The rules 1562equinoxes, and the phases of the moon take that into account. The rules
1563for daylight savings time vary from place to place and have also varied 1563for daylight saving time vary from place to place and have also varied
1564historically from year to year. To do the job properly, Emacs needs to 1564historically from year to year. To do the job properly, Emacs needs to
1565know which rules to use. 1565know which rules to use.
1566 1566
@@ -1577,12 +1577,12 @@ you can tell Emacs the rules to use by setting certain variables:
1577 1577
1578 These values should be Lisp expressions that refer to the variable 1578 These values should be Lisp expressions that refer to the variable
1579@code{year}, and evaluate to the Gregorian date on which daylight 1579@code{year}, and evaluate to the Gregorian date on which daylight
1580savings time starts or (respectively) ends, in the form of a list 1580saving time starts or (respectively) ends, in the form of a list
1581@code{(@var{month} @var{day} @var{year})}. The values should be 1581@code{(@var{month} @var{day} @var{year})}. The values should be
1582@code{nil} if your area does not use daylight savings time. 1582@code{nil} if your area does not use daylight saving time.
1583 1583
1584 Emacs uses these expressions to determine the starting date of 1584 Emacs uses these expressions to determine the starting date of
1585daylight savings time for the holiday list and for correcting times of 1585daylight saving time for the holiday list and for correcting times of
1586day in the solar and lunar calculations. 1586day in the solar and lunar calculations.
1587 1587
1588 The values for Cambridge, Massachusetts are as follows: 1588 The values for Cambridge, Massachusetts are as follows:
@@ -1595,7 +1595,7 @@ day in the solar and lunar calculations.
1595@noindent 1595@noindent
1596That is, the second 0th day (Sunday) of the third month (March) in 1596That is, the second 0th day (Sunday) of the third month (March) in
1597the year specified by @code{year}, and the first Sunday of the eleventh month 1597the year specified by @code{year}, and the first Sunday of the eleventh month
1598(November) of that year. If daylight savings time were 1598(November) of that year. If daylight saving time were
1599changed to start on October 1, you would set 1599changed to start on October 1, you would set
1600@code{calendar-daylight-savings-starts} to this: 1600@code{calendar-daylight-savings-starts} to this:
1601 1601
@@ -1603,13 +1603,13 @@ changed to start on October 1, you would set
1603(list 10 1 year) 1603(list 10 1 year)
1604@end example 1604@end example
1605 1605
1606 If there is no daylight savings time at your location, or if you want 1606 If there is no daylight saving time at your location, or if you want
1607all times in standard time, set @code{calendar-daylight-savings-starts} 1607all times in standard time, set @code{calendar-daylight-savings-starts}
1608and @code{calendar-daylight-savings-ends} to @code{nil}. 1608and @code{calendar-daylight-savings-ends} to @code{nil}.
1609 1609
1610@vindex calendar-daylight-time-offset 1610@vindex calendar-daylight-time-offset
1611 The variable @code{calendar-daylight-time-offset} specifies the 1611 The variable @code{calendar-daylight-time-offset} specifies the
1612difference between daylight savings time and standard time, measured in 1612difference between daylight saving time and standard time, measured in
1613minutes. The value for Cambridge, Massachusetts is 60. 1613minutes. The value for Cambridge, Massachusetts is 60.
1614 1614
1615@c @vindex calendar-daylight-savings-starts-time too long! 1615@c @vindex calendar-daylight-savings-starts-time too long!
@@ -1617,7 +1617,7 @@ minutes. The value for Cambridge, Massachusetts is 60.
1617 The two variables @code{calendar-daylight-savings-starts-time} and 1617 The two variables @code{calendar-daylight-savings-starts-time} and
1618@code{calendar-daylight-savings-ends-time} specify the number of minutes 1618@code{calendar-daylight-savings-ends-time} specify the number of minutes
1619after midnight local time when the transition to and from daylight 1619after midnight local time when the transition to and from daylight
1620savings time should occur. For Cambridge, Massachusetts both variables' 1620saving time should occur. For Cambridge, Massachusetts both variables'
1621values are 120. 1621values are 120.
1622 1622
1623@node Time Intervals 1623@node Time Intervals