- (-t) use macros instead of punctuation, to avoid marking up the

whole argument as an Ar block
- (-t) remove a superfluous set of [] around "mm"

ok sobrado millert

2 files changed, 10 insertions, 6 deletions

diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index 7ca3b76a489..50e1a4e462c 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: calendar.1,v 1.33 2007/05/31 19:20:08 jmc Exp $
+.\"	$OpenBSD: calendar.1,v 1.34 2011/09/12 21:23:00 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: May 31 2007 $
+.Dd $Mdocdate: September 12 2011 $
 .Dt CALENDAR 1
 .Os
 .Sh NAME
@@ -41,7 +41,9 @@
 .Op Fl A Ar num
 .Op Fl B Ar num
 .Op Fl f Ar calendarfile
-.Op Fl t Ar [[[cc]yy][mm]]dd
+.Sm off
+.Op Fl "t " Oo Oo Oo Ar cc Oc Ar yy Oc Ar mm Oc Ar dd
+.Sm on
 .Sh DESCRIPTION
 The
 .Nm
@@ -75,7 +77,9 @@ Enforce special date calculation mode for KOI8 calendars.
 Use
 .Pa calendarfile
 as the default calendar file.
-.It Fl t Ar [[[cc]yy][mm]]dd
+.Sm off
+.It Fl "t " Oo Oo Oo Ar cc Oc Ar yy Oc Ar mm Oc Ar dd
+.Sm on
 Act like the specified value is
 .Dq today
 instead of using the current date.
diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index 525fd0f00af..05132a3b66a 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: calendar.c,v 1.26 2009/10/27 23:59:36 deraadt Exp $	*/
+/*	$OpenBSD: calendar.c,v 1.27 2011/09/12 21:23:00 jmc Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -246,7 +246,7 @@ usage(void)
 {
 	(void)fprintf(stderr,
 	    "usage: calendar [-ab] [-A num] [-B num] [-f calendarfile] "
-	    "[-t [[[cc]yy][mm]]dd]\n");
+	    "[-t [[[cc]yy]mm]dd]\n");
 	exit(1);
 }