diff options
author | Leah Neukirchen <leah@vuxu.org> | 2018-06-26 14:50:32 +0200 |
---|---|---|
committer | Leah Neukirchen <leah@vuxu.org> | 2018-06-26 14:50:32 +0200 |
commit | 0e384ca6517b0f571f1016498dd69c53f34e686f (patch) | |
tree | 69f6f37ecd35aa821fcdb94bd1d1c41f691460f0 | |
parent | 04b4ec2fd69f10e43e28656e95965777541428da (diff) | |
download | outils-0e384ca6517b0f571f1016498dd69c53f34e686f.tar.gz outils-0e384ca6517b0f571f1016498dd69c53f34e686f.tar.xz outils-0e384ca6517b0f571f1016498dd69c53f34e686f.zip |
cvs update
-rw-r--r-- | src/usr.bin/calendar/calendar.1 | 6 | ||||
-rw-r--r-- | src/usr.bin/calendar/calendars/calendar.openbsd | 3 | ||||
-rw-r--r-- | src/usr.bin/jot/jot.c | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/usr.bin/calendar/calendar.1 b/src/usr.bin/calendar/calendar.1 index a270eee..306d2e1 100644 --- a/src/usr.bin/calendar/calendar.1 +++ b/src/usr.bin/calendar/calendar.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: calendar.1,v 1.42 2016/01/20 19:12:28 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 $Mdocdate: January 20 2016 $ +.Dd $Mdocdate: June 3 2018 $ .Dt CALENDAR 1 .Os .Sh NAME @@ -227,7 +227,7 @@ obscure). Jewish holidays (should be updated yearly by the local system administrator 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 diff --git a/src/usr.bin/calendar/calendars/calendar.openbsd b/src/usr.bin/calendar/calendars/calendar.openbsd index 22f4009..373881e 100644 --- a/src/usr.bin/calendar/calendars/calendar.openbsd +++ b/src/usr.bin/calendar/calendars/calendar.openbsd @@ -1,7 +1,7 @@ /* * OpenBSD-related dates to celebrate * - * $OpenBSD: calendar.openbsd,v 1.39 2018/03/01 20:48:11 jmc Exp $ + * $OpenBSD: calendar.openbsd,v 1.40 2018/04/24 19:14:04 mlarkin Exp $ */ #ifndef _calendar_openbsd_ @@ -35,6 +35,7 @@ Apr 16 OpenBSD/i386 is ELF, 2003 Apr 17 m2k14: Mini-hackathon, Marrakech, Morocco, 12 developers, 2014 Apr 19 OpenBSD/solbourne port is added, 2005 Apr 21 OpenBSD/luna88k port is added, 2004 +Apr 23 p2k18: Ports hackathon, Nantes, France, 24 developers, 2018 Apr 24 pf2k4: PF hackathon, Sechelt, BC, 12 developers, 2004 Apr 27 i386/PAE work integrated, 2006 May 01 OpenBSD 3.3 released, exploiting W^X, 2003 diff --git a/src/usr.bin/jot/jot.c b/src/usr.bin/jot/jot.c index 499840d..1f7aacd 100644 --- a/src/usr.bin/jot/jot.c +++ b/src/usr.bin/jot/jot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: jot.c,v 1.45 2018/01/13 15:43:39 tb Exp $ */ +/* $OpenBSD: jot.c,v 1.46 2018/06/24 18:39:57 schwarze Exp $ */ /* $NetBSD: jot.c,v 1.3 1994/12/02 20:29:43 pk Exp $ */ /*- @@ -161,9 +161,7 @@ main(int argc, char *argv[]) if (prec == -1) prec = 0; } - break; case 0: - usage(); break; default: errx(1, "Too many arguments. What do you mean by %s?", |