aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2007-11-11 03:20:35 +0000
committerGlenn Morris2007-11-11 03:20:35 +0000
commit37b11c22c17b90111f39c74b14eafbcfeab77594 (patch)
tree9a0327cc6684efcf14dea63c971f51dc6d65a04c /doc
parenta457417ee5ba797ab1c91d35ee957bb7a7f8d4b6 (diff)
downloademacs-37b11c22c17b90111f39c74b14eafbcfeab77594.tar.gz
emacs-37b11c22c17b90111f39c74b14eafbcfeab77594.zip
(Special Diary Entries): Fix Thanksgiving example.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/calendar.texi10
2 files changed, 9 insertions, 5 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 3c020fcc5e7..dbb2340cab5 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12007-11-11 Glenn Morris <rgm@gnu.org>
2
3 * calendar.texi (Special Diary Entries): Fix Thanksgiving example.
4
12007-11-10 Paul Pogonyshev <pogonyshev@gmx.net> 52007-11-10 Paul Pogonyshev <pogonyshev@gmx.net>
2 6
3 * search.texi (Query Replace): Mention 7 * search.texi (Query Replace): Mention
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index 6b285094735..bb359a962a3 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -1397,19 +1397,19 @@ nonmarking (with @samp{&}) when possible.
1397specifies a regularly occurring event by offsets specified in days, 1397specifies a regularly occurring event by offsets specified in days,
1398weeks, and months. It is comparable to a crontab entry interpreted by 1398weeks, and months. It is comparable to a crontab entry interpreted by
1399the @code{cron} utility. Here is a nonmarking, floating diary entry 1399the @code{cron} utility. Here is a nonmarking, floating diary entry
1400that applies to the last Thursday in November: 1400that applies to the fourth Thursday in November:
1401 1401
1402@findex diary-float 1402@findex diary-float
1403@example 1403@example
1404&%%(diary-float 11 4 -1) American Thanksgiving 1404&%%(diary-float 11 4 4) American Thanksgiving
1405@end example 1405@end example
1406 1406
1407@noindent 1407@noindent
1408The 11 specifies November (the eleventh month), the 4 specifies Thursday 1408The 11 specifies November (the eleventh month), the 4 specifies Thursday
1409(the fourth day of the week, where Sunday is numbered zero), and the 1409(the fourth day of the week, where Sunday is numbered zero), and the
1410@minus{}1 specifies ``last'' (1 would mean ``first,'' 2 would mean 1410second 4 specifies the fourth Thursday (1 would mean ``first,'' 2 would
1411``second,'' @minus{}2 would mean ``second-to-last,'' and so on). The 1411mean ``second,'' @minus{}2 would mean ``second-to-last,'' and so on).
1412month can be a single month or a list of months. Thus you could change 1412The month can be a single month or a list of months. Thus you could change
1413the 11 above to @samp{'(1 2 3)} and have the entry apply to the last 1413the 11 above to @samp{'(1 2 3)} and have the entry apply to the last
1414Thursday of January, February, and March. If the month is @code{t}, the 1414Thursday of January, February, and March. If the month is @code{t}, the
1415entry applies to all months of the year.@refill 1415entry applies to all months of the year.@refill