===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/calendar.1,v
retrieving revision 1.18
retrieving revision 1.25
diff -u -r1.18 -r1.25
--- src/usr.bin/calendar/calendar.1	2002/03/20 22:59:56	1.18
+++ src/usr.bin/calendar/calendar.1	2004/02/09 20:48:39	1.25
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: calendar.1,v 1.18 2002/03/20 22:59:56 mickey Exp $
+.\"	$OpenBSD: calendar.1,v 1.25 2004/02/09 20:48:39 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"     The Regents of the University of California.  All rights reserved.
@@ -11,11 +11,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
@@ -41,9 +37,8 @@
 .Nd reminder service
 .Sh SYNOPSIS
 .Nm calendar
-.Op Fl a
+.Op Fl ab
 .Op Fl A Ar num
-.Op Fl b
 .Op Fl B Ar num
 .Op Fl f Ar calendarfile
 .Op Fl t Ar [[[cc]yy][mm]]dd
@@ -60,22 +55,22 @@
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
+.It Fl A Ar num
+Print lines from today and next
+.Ar num
+days (forward, future).
 .It Fl a
 Process the
 .Dq calendar
 files of all users and mail the results
 to them.
 This requires superuser privileges.
-.It Fl A Ar num
-Print lines from today and next
-.Ar num
-days (forward, future).
-.It Fl b
-Enforce special date calculation mode for KOI8 calendars.
 .It Fl B Ar num
 Print lines from today and previous
 .Ar num
 days (backward, past).
+.It Fl b
+Enforce special date calculation mode for KOI8 calendars.
 .It Fl f Pa calendarfile
 Use
 .Pa calendarfile
@@ -174,49 +169,53 @@
 .Sh FILES
 .Bl -tag -width ~/.calendar/calendar -compact
 .It Pa calendar
-file in current directory
+File in current directory.
 .It Pa ~/.calendar
-file in home directory (which
+Directory in the user's home directory (which
 .Nm
-.Xr chdir 1 's
-into if it exists)
+changes into, if it exists).
 .It Pa ~/.calendar/calendar
-file to use if no calendar file exists in the current directory
+File to use if no calendar file exists in the current directory.
 .It Pa ~/.calendar/nomail
 .Nm
-will not send mail if this file exists
+will not send mail if this file exists.
 .It Pa calendar.birthday
-births and deaths of famous (and not-so-famous) people
+Births and deaths of famous (and not-so-famous) people.
 .It Pa calendar.christian
 Christian holidays (should be updated yearly by the local system administrator
-so that roving holidays are set correctly for the current year)
+so that roving holidays are set correctly for the current year).
 .It Pa calendar.computer
-days of special significance to computer people
+Days of special significance to computer people.
+.It Pa calendar.croatian
+Croatian calendar.
 .It Pa calendar.fictional
-Fantasy and Fiction dates (mostly LOTR)
+Fantasy and fiction dates (mostly LOTR).
+.It Pa calendar.french
+French calendar.
+.It Pa calendar.german
+German calendar.
 .It Pa calendar.history
-everything else, mostly U.S. historical events
+Everything else, mostly U.S. historical events.
 .It Pa calendar.holiday
-other holidays (including the not-well-known, obscure, and
+Other holidays (including the not-well-known, obscure, and
 .Em really
-obscure)
+obscure).
 .It Pa calendar.judaic
 Jewish holidays (should be updated yearly by the local system administrator
-so that roving holidays are set correctly for the current year)
+so that roving holidays are set correctly for the current year).
 .It Pa calendar.music
-musical events, births, and deaths (strongly oriented toward rock n' roll)
+Musical events, births, and deaths (strongly oriented toward rock n' roll).
+.It Pa calendar.openbsd
+.Ox
+related events.
 .It Pa calendar.pagan
-Pagan holidays, celebrations and festivals
+Pagan holidays, celebrations and festivals.
+.It Pa calendar.russian
+Russian calendar.
 .It Pa calendar.usholiday
-U.S. holidays
+U.S. holidays.
 .It Pa calendar.world
-World wide calendar
-.It Pa calendar.croatian
-Croatian calendar
-.It Pa calendar.german
-German calendar
-.It Pa calendar.russian
-Russian calendar
+World wide calendar.
 .El
 .Sh SEE ALSO
 .Xr at 1 ,
@@ -224,7 +223,7 @@
 .Xr cpp 1 ,
 .Xr mail 1 ,
 .Xr cron 8
-.Sh COMPATIBILITY
+.Sh STANDARDS
 The
 .Nm
 program previously selected lines which had the correct date anywhere