summaryrefslogtreecommitdiff
path: root/doc/emacs/calendar.texi
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-10-16 22:39:24 +0000
committerMiles Bader <miles@gnu.org>2007-10-16 22:39:24 +0000
commit81d3d428c6b88e6c99f3fad6b7cc52c12236ff56 (patch)
tree64eeb2b5872f9418a76cb1d5d73b3fdcc1fd557f /doc/emacs/calendar.texi
parent9beb8baa1f1b59f8e76df62e95647c39acbac5e7 (diff)
parentc2c0d96fcaa3dc16a2ddc7b7f0b2e1fcdfffb285 (diff)
downloademacs-81d3d428c6b88e6c99f3fad6b7cc52c12236ff56.tar.gz
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-892
Diffstat (limited to 'doc/emacs/calendar.texi')
-rw-r--r--doc/emacs/calendar.texi11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index 1357784b920..47858f4f99e 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -989,9 +989,8 @@ events for today, for the immediate future, or for any specified
date.
The name of the diary file is specified by the variable
-@code{diary-file}; @file{~/diary} is the default. A sample diary file
-is (note that the file format is essentially the same as that used by
-the external shell utility @samp{calendar}):
+@code{diary-file}; @file{~/diary} is the default. Here's an example
+showing what that file looks like:
@example
12/22/1988 Twentieth wedding anniversary!!
@@ -1008,8 +1007,10 @@ April 15, 1989 Income tax due.
@end example
@noindent
-This example uses extra spaces to align the event descriptions of most
-of the entries. Such formatting is purely a matter of taste.
+This format is essentially the same as the one used by the system's
+@program{calendar} utility. This example uses extra spaces to align
+the event descriptions of most of the entries. Such formatting is
+purely a matter of taste.
Although you probably will start by creating a diary manually, Emacs
provides a number of commands to let you view, add, and change diary