aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2007-10-16 02:24:50 +0000
committerRichard M. Stallman2007-10-16 02:24:50 +0000
commitde13cecf7a1d7525e54b5a93a59dcc40a1582ee4 (patch)
tree52bacea872e6d55d1e1b8fa569e23660c220106f
parent450c1882ff144972faec9a6388beb762f1823f40 (diff)
downloademacs-de13cecf7a1d7525e54b5a93a59dcc40a1582ee4.tar.gz
emacs-de13cecf7a1d7525e54b5a93a59dcc40a1582ee4.zip
(Diary): Clarify text about diary file example.
-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 6b8affa4888..d329e0dfd72 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
12007-10-16 Richard Stallman <rms@gnu.org>
2
3 * calendar.texi (Diary): Clarify text about diary file example.
4
12007-10-13 Glenn Morris <rgm@gnu.org> 52007-10-13 Glenn Morris <rgm@gnu.org>
2 6
3 * misc.texi (Interactive Shell): Correct INSIDE_EMACS reference. 7 * misc.texi (Interactive Shell): Correct INSIDE_EMACS reference.
diff --git a/man/calendar.texi b/man/calendar.texi
index 5182474622d..12d5b68a371 100644
--- a/man/calendar.texi
+++ b/man/calendar.texi
@@ -989,9 +989,8 @@ events for today, for the immediate future, or for any specified
989date. 989date.
990 990
991 The name of the diary file is specified by the variable 991 The name of the diary file is specified by the variable
992@code{diary-file}; @file{~/diary} is the default. A sample diary file 992@code{diary-file}; @file{~/diary} is the default. Here's an example
993is (note that the file format is essentially the same as that used by 993showing what that file looks like:
994the external shell utility @samp{calendar}):
995 994
996@example 995@example
99712/22/1988 Twentieth wedding anniversary!! 99612/22/1988 Twentieth wedding anniversary!!
@@ -1008,8 +1007,10 @@ April 15, 1989 Income tax due.
1008@end example 1007@end example
1009 1008
1010@noindent 1009@noindent
1011This example uses extra spaces to align the event descriptions of most 1010This format is essentially the same as the one used by the system's
1012of the entries. Such formatting is purely a matter of taste. 1011@program{calendar} utility. This example uses extra spaces to align
1012the event descriptions of most of the entries. Such formatting is
1013purely a matter of taste.
1013 1014
1014 Although you probably will start by creating a diary manually, Emacs 1015 Although you probably will start by creating a diary manually, Emacs
1015provides a number of commands to let you view, add, and change diary 1016provides a number of commands to let you view, add, and change diary