=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/calendar.1,v retrieving revision 1.8 retrieving revision 1.18 diff -u -r1.8 -r1.18 --- src/usr.bin/calendar/calendar.1 1998/11/08 04:37:51 1.8 +++ src/usr.bin/calendar/calendar.1 2002/03/20 22:59:56 1.18 @@ -1,4 +1,4 @@ -.\" $OpenBSD: calendar.1,v 1.8 1998/11/08 04:37:51 pjanzen Exp $ +.\" $OpenBSD: calendar.1,v 1.18 2002/03/20 22:59:56 mickey Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -43,12 +43,13 @@ .Nm calendar .Op Fl a .Op Fl A Ar num +.Op Fl b .Op Fl B Ar num -.Op Fl t Ar [[[cc]yy][mm]]dd .Op Fl f Ar calendarfile +.Op Fl t Ar [[[cc]yy][mm]]dd .Sh DESCRIPTION The -.Nm calendar +.Nm utility checks the current directory or the directory specified by the .Ev CALENDAR_DIR environment variable for a file named @@ -57,16 +58,20 @@ or tomorrow's. On Fridays, events on Friday through Monday are displayed. .Pp -The following options are available: +The options are as follows: .Bl -tag -width Ds .It Fl a -Process the ``calendar'' files of all users and mail the results +Process the +.Dq calendar +files of all users and mail the results to them. -This requires super-user privileges. +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 @@ -76,18 +81,27 @@ .Pa calendarfile as the default calendar file. .It Fl t Ar [[[cc]yy][mm]]dd -Act like the specified value is ``today'' instead of using the current date. +Act like the specified value is +.Dq today +instead of using the current date. .El .Pp To handle calendars in your national code table you can specify .Dq LANG= -in the calendar file as early as possible. To handle national Easter -names in the calendars, +in the calendar file as early as possible. +To handle national Easter names in the calendars, .Dq Easter= (for Catholic Easter) or .Dq Paskha= (for Orthodox Easter) can be used. .Pp +To enforce special date calculation mode for Cyrillic calendars +you should specify +.Dq LANG= +and +.Dq BODUN= +where can be ru_RU.KOI8-R, uk_UA.KOI8-U or by_BY.KOI8-B. +.Pp Other lines should begin with a month and day. They may be entered in almost any format, either numeric or as character strings. @@ -99,13 +113,17 @@ Two numbers default to the month followed by the day. Lines with leading tabs default to the last entered date, allowing multiple line specifications for a single date. -``Easter'' (may be followed by a positive or negative integer) is -Easter for this year. -``Paskha'' (may be followed by a positive or negative integer) is +.Dq Easter +(may be followed by a positive or negative integer) is Easter for this year. +.Dq Paskha +(may be followed by a positive or negative integer) is Orthodox Easter for this year. -Weekdays may be followed by ``-4'' ... ``+5'' (aliases -last, first, second, third, fourth) for moving events like -``the last Monday in April''. +Weekdays may be followed by +.Dq -4 +.Li ... +.Dq +5 +(aliases last, first, second, third, fourth) for moving events like +.Dq the last Monday in April . .Pp By convention, dates followed by an asterisk .Pq Sq * @@ -117,7 +135,7 @@ If the first character in the line is a character, it is treated as the continuation of the previous description. .Pp -The ``calendar'' file is preprocessed by +The calendar file is preprocessed by .Xr cpp 1 , allowing the inclusion of shared files such as company holidays or meetings. @@ -159,13 +177,13 @@ file in current directory .It Pa ~/.calendar file in home directory (which -.Nm calendar +.Nm .Xr chdir 1 's into if it exists) .It Pa ~/.calendar/calendar file to use if no calendar file exists in the current directory .It Pa ~/.calendar/nomail -.Nm calendar +.Nm will not send mail if this file exists .It Pa calendar.birthday births and deaths of famous (and not-so-famous) people @@ -174,6 +192,8 @@ so that roving holidays are set correctly for the current year) .It Pa calendar.computer days of special significance to computer people +.It Pa calendar.fictional +Fantasy and Fiction dates (mostly LOTR) .It Pa calendar.history everything else, mostly U.S. historical events .It Pa calendar.holiday @@ -185,9 +205,14 @@ 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) +.It Pa calendar.pagan +Pagan holidays, celebrations and festivals .It Pa calendar.usholiday -U.S. holidays (should be updated yearly by the local system administrator -so that roving holidays are set correctly for the current year) +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 @@ -195,15 +220,16 @@ .El .Sh SEE ALSO .Xr at 1 , +.Xr cal 1 , .Xr cpp 1 , .Xr mail 1 , .Xr cron 8 .Sh COMPATIBILITY The -.Nm calendar +.Nm program previously selected lines which had the correct date anywhere in the line. -This is no longer true: the date is only recognized when it occurs +This is no longer true: the date is only recognized when it occurs at the beginning of a line. .Sh HISTORY A @@ -211,19 +237,5 @@ command appeared in .At v7 . .Sh BUGS -.Nm calendar +.Nm doesn't handle Jewish holidays or moon phases. -.br -When used with the -.Fl A -and -.Fl B -flags, -.Nm calendar -will only print the first instance of periodic events. When using the -.Fl A -and -.Fl B -flags to cross a year boundary, -.Nm calendar -will use calculate the date of easter in the current year, not the next year.