=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/calendar.1,v retrieving revision 1.23 retrieving revision 1.43 diff -u -r1.23 -r1.43 --- src/usr.bin/calendar/calendar.1 2003/06/10 09:12:09 1.23 +++ src/usr.bin/calendar/calendar.1 2018/06/03 06:50:35 1.43 @@ -1,4 +1,4 @@ -.\" $OpenBSD: calendar.1,v 1.23 2003/06/10 09:12:09 jmc Exp $ +.\" $OpenBSD: calendar.1,v 1.43 2018/06/03 06:50:35 jmc Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)calendar.1 8.1 (Berkeley) 6/29/93 .\" -.Dd June 29, 1993 +.Dd $Mdocdate: June 3 2018 $ .Dt CALENDAR 1 .Os .Sh NAME @@ -37,12 +37,11 @@ .Nd reminder service .Sh SYNOPSIS .Nm calendar -.Op Fl a +.Op Fl abw .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 +.Op Fl t Oo Oo Oo Ar cc Oc Ns Ar yy Oc Ns Ar mm Oc Ns Ar dd .Sh DESCRIPTION The .Nm @@ -56,30 +55,35 @@ .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 f Pa calendarfile +.It Fl b +Enforce special date calculation mode for Cyrillic calendars. +.It Fl f Ar calendarfile Use -.Pa calendarfile +.Ar calendarfile as the default calendar file. -.It Fl t Ar [[[cc]yy][mm]]dd +.It Fl t Oo Oo Oo Ar cc Oc Ns Ar yy Oc Ns Ar mm Oc Ns Ar dd Act like the specified value is .Dq today instead of using the current date. +If yy is specified, but cc is not, +a value for yy between 69 and 99 results in a cc value of 19. +Otherwise, a cc value of 20 is used. +.It Fl w +Print day of the week name in front of each event. .El .Pp To handle calendars in your national code table you can specify @@ -91,12 +95,24 @@ .Dq Paskha= (for Orthodox Easter) can be used. .Pp +The +.Dq CALENDAR +variable can be used to specify the style. +Only +.Sq Julian +and +.Sq Gregorian +styles are currently supported. +Use +.Dq CALENDAR= +to return to the default (Gregorian). +.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. +where can be ru_RU.UTF-8, uk_UA.UTF-8 or by_BY.UTF-8. .Pp Other lines should begin with a month and day. They may be entered in almost any format, either numeric or as character @@ -144,8 +160,8 @@ .Pq Li /* ... */ are ignored. .Pp -Some possible calendar entries ( characters are highlighted by a -\fB\et\fR sequence): +Some possible calendar entries +(a \fB\et\fR sequence denotes a character): .Bd -unfilled -offset indent LANG=C Easter=Ostern @@ -157,64 +173,80 @@ Jun. 15\fB\et\fRJune 15. 15 June\fB\et\fRJune 15. Thursday\fB\et\fREvery Thursday. -June\fB\et\fREvery June 1st. +June\fB\et\fREvery June 1st. 15 *\fB\et\fR15th of every month. -May Sun+2\fB\et\fRsecond Sunday in May (Muttertag) -04/SunLast\fB\et\fRlast Sunday in April, -\fB\et\fRsummer time in Europe +May Sun+2\fB\et\fRsecond Sunday in May (Muttertag) +04/SunLast\fB\et\fRlast Sunday in April, +\fB\et\fRsummer time in Europe Easter\fB\et\fREaster -Ostern-2\fB\et\fRGood Friday (2 days before Easter) -Paskha\fB\et\fROrthodox Easter +Ostern-2\fB\et\fRGood Friday (2 days before Easter) +Paskha\fB\et\fROrthodox Easter .Ed .Sh FILES .Bl -tag -width ~/.calendar/calendar -compact .It Pa calendar -file in current directory +File in current directory. .It Pa ~/.calendar -directory in the user's home directory (which +Directory in the user's home directory (which .Nm -changes 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.all +International and national calendar files. .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.canada +Canadian holidays. .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.discord +Discordian calendar (all rites reversed). .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 +Miscellaneous history. .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.nz +New Zealand calendar. .It Pa calendar.openbsd .Ox -related events +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.space +Cosmic history. +.It Pa calendar.uk +UK calendar. +.It Pa calendar.ushistory +U.S. history. .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 , @@ -236,4 +268,4 @@ .At v7 . .Sh BUGS .Nm -doesn't handle Jewish holidays or moon phases. +doesn't handle all Jewish holidays or moon phases.