aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-04-29 03:40:45 +0000
committerGlenn Morris2008-04-29 03:40:45 +0000
commitff2c14fc126e15d5f711982750ca6dd967e1b6a3 (patch)
tree4f03515cbea5bed964abe8f937a4f8bd73ea7654
parent51d16e07bb6653e55d6981be70f688298941d6a0 (diff)
downloademacs-ff2c14fc126e15d5f711982750ca6dd967e1b6a3.tar.gz
emacs-ff2c14fc126e15d5f711982750ca6dd967e1b6a3.zip
(Sexp Diary Entries): Clarify diary-float.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/cal-xtra.texi16
2 files changed, 12 insertions, 8 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 2fddf83b400..14a25643dfe 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12008-04-29 Glenn Morris <rgm@gnu.org>
2
3 * cal-xtra.texi (Sexp Diary Entries): Clarify diary-float.
4
12008-04-22 Juri Linkov <juri@jurta.org> 52008-04-22 Juri Linkov <juri@jurta.org>
2 6
3 * dired.texi (Subdirectories in Dired): Describe using `^' 7 * dired.texi (Subdirectories in Dired): Describe using `^'
diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi
index 0cd63cf686f..c0e1e62bf92 100644
--- a/doc/emacs/cal-xtra.texi
+++ b/doc/emacs/cal-xtra.texi
@@ -701,14 +701,14 @@ on October 22, November 22, and December 22 of every year.
701that apply to dates like the third Friday of November, or the last 701that apply to dates like the third Friday of November, or the last
702Tuesday in April. The parameters are the @var{month}, @var{dayname}, 702Tuesday in April. The parameters are the @var{month}, @var{dayname},
703and an index @var{n}. The entry appears on the @var{n}th @var{dayname} 703and an index @var{n}. The entry appears on the @var{n}th @var{dayname}
704of @var{month}, where @var{dayname}=0 means Sunday, 1 means Monday, and 704after the first day of @var{month}, where @var{dayname}=0 means Sunday,
705so on. If @var{n} is negative it counts backward from the end of 7051 means Monday, and so on. If @var{n} is negative it counts backward
706@var{month}. The value of @var{month} can be a list of months, a single 706from the end of @var{month}. The value of @var{month} can be a list of
707month, or @code{t} to specify all months. You can also use an optional 707months, a single month, or @code{t} to specify all months. You can also
708parameter @var{day} to specify the @var{n}th @var{dayname} of 708use an optional parameter @var{day} to specify the @var{n}th
709@var{month} on or after/before @var{day}; the value of @var{day} defaults 709@var{dayname} on or after/before @var{day} of @var{month}; the value of
710to 1 if @var{n} is positive and to the last day of @var{month} if 710@var{day} defaults to 1 if @var{n} is positive and to the last day of
711@var{n} is negative. For example, 711@var{month} if @var{n} is negative. For example,
712 712
713@smallexample 713@smallexample
714%%(diary-float t 1 -1) Pay rent 714%%(diary-float t 1 -1) Pay rent