aboutsummaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorRichard M. Stallman <[email protected]>2007-10-16 02:24:50 +0000
committerRichard M. Stallman <[email protected]>2007-10-16 02:24:50 +0000
commitde13cecf7a1d7525e54b5a93a59dcc40a1582ee4 (patch)
tree52bacea872e6d55d1e1b8fa569e23660c220106f /man
parent450c1882ff144972faec9a6388beb762f1823f40 (diff)
(Diary): Clarify text about diary file example.
Diffstat (limited to 'man')
-rw-r--r--man/ChangeLog4
-rw-r--r--man/calendar.texi11
2 files changed, 10 insertions, 5 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 6b8affa488..d329e0dfd7 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-16 Richard Stallman <[email protected]>
+
+ * calendar.texi (Diary): Clarify text about diary file example.
+
2007-10-13 Glenn Morris <[email protected]>
* misc.texi (Interactive Shell): Correct INSIDE_EMACS reference.
diff --git a/man/calendar.texi b/man/calendar.texi
index 5182474622..12d5b68a37 100644
--- a/man/calendar.texi
+++ b/man/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