sort options, correct SYNOPSIS, and sync usage();

4 files changed, 22 insertions, 23 deletions

diff --git a/lib/libc/time/zdump.8 b/lib/libc/time/zdump.8
index 8b420692ff6..6eaa952075a 100644
--- a/lib/libc/time/zdump.8
+++ b/lib/libc/time/zdump.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: zdump.8,v 1.8 2003/10/06 00:17:13 millert Exp $
+.\"	$OpenBSD: zdump.8,v 1.9 2004/04/01 11:37:02 jmc Exp $
 .Dd May 23, 1999
 .Dt ZDUMP 8
 .Os
@@ -9,7 +9,7 @@
 .Nm zdump
 .Op Fl v
 .Op Fl c Ar cutoffyear
-.Op Ar zonename Ar ...
+.Ar zonename Ar ...
 .Sh DESCRIPTION
 .Nm
 prints the current time in each
@@ -18,6 +18,8 @@ named on the command line.
 .Pp
 These options are available:
 .Bl -tag -width Fl
+.It Fl c Ar cutoffyear
+Cut off the verbose output near the start of the given year.
 .It Fl v
 For each
 .Ar zonename
@@ -33,8 +35,6 @@ Each line ends with
 if the given time is Daylight Saving Time or
 .Dq isdst=0
 otherwise.
-.It Fl c Ar cutoffyear
-Cut off the verbose output near the start of the given year.
 .El
 .Sh SEE ALSO
 .Xr ctime 3 ,
diff --git a/lib/libc/time/zdump.c b/lib/libc/time/zdump.c
index 7873f1f96e6..baaec05b26a 100644
--- a/lib/libc/time/zdump.c
+++ b/lib/libc/time/zdump.c
@@ -5,7 +5,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
 static char elsieid[] = "@(#)zdump.c	7.31";
-static char rcsid[] = "$OpenBSD: zdump.c,v 1.12 2003/10/06 00:17:13 millert Exp $";
+static char rcsid[] = "$OpenBSD: zdump.c,v 1.13 2004/04/01 11:37:02 jmc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -175,7 +175,7 @@ char *	argv[];
 	if ((c != EOF && c != -1) ||
 		(optind == argc - 1 && strcmp(argv[optind], "=") == 0)) {
 			(void) fprintf(stderr,
-_("%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"),
+_("%s: usage is %s [-v] [-c cutoffyear] zonename ...\n"),
 				argv[0], argv[0]);
 			(void) exit(EXIT_FAILURE);
 	}
diff --git a/lib/libc/time/zic.8 b/lib/libc/time/zic.8
index dd63b3a18ae..704fb3d79d8 100644
--- a/lib/libc/time/zic.8
+++ b/lib/libc/time/zic.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: zic.8,v 1.15 2003/10/06 00:17:13 millert Exp $
+.\"	$OpenBSD: zic.8,v 1.16 2004/04/01 11:37:02 jmc Exp $
 .Dd May 23, 1999
 .Dt ZIC 8
 .Os
@@ -7,16 +7,15 @@
 .Nd time zone compiler
 .Sh SYNOPSIS
 .Nm zic
-.Op Fl v
-.Op Fl d Ar directory
-.Op Fl l Ar localtime
-.Op Fl p Ar posixrules
 .Bk -words
+.Op Fl sv
+.Op Fl d Ar directory
 .Op Fl L Ar leapsecondfilename
-.Ek
-.Op Fl s
+.Op Fl l Ar timezone
+.Op Fl p Ar timezone
 .Op Fl y Ar command
 .Op Ar filename Ar ...
+.Ek
 .Sh DESCRIPTION
 .Nm
 reads text from the file(s) named on the command line
@@ -32,6 +31,10 @@ These options are available:
 .It Fl d Ar directory
 Create time conversion information files in the named directory rather than
 in the standard directory named below.
+.It Fl L Ar leapsecondfilename
+Read leap second information from the file with the given name.
+If this option is not used,
+no leap second information appears in output files.
 .It Fl l Ar timezone
 Use the given time zone as local time.
 .Nm
@@ -45,19 +48,15 @@ time zone environment variables.
 will act as if the input contained a link line of the form
 .Pp
 .Dl Link	timezone		posixrules
-.It Fl L Ar leapsecondfilename
-Read leap second information from the file with the given name.
-If this option is not used,
-no leap second information appears in output files.
+.It Fl s
+Limit time values stored in output files to values that are the same
+whether they're taken to be signed or unsigned.
+You can use this option to generate SVVS-compatible files.
 .It Fl v
 Complain if a year that appears in a data file is outside the range
 of years representable by
 .Xr time 3
 values.
-.It Fl s
-Limit time values stored in output files to values that are the same
-whether they're taken to be signed or unsigned.
-You can use this option to generate SVVS-compatible files.
 .It Fl y Ar command
 Use the given
 .Ar command
diff --git a/lib/libc/time/zic.c b/lib/libc/time/zic.c
index bd400cad849..04fe10de796 100644
--- a/lib/libc/time/zic.c
+++ b/lib/libc/time/zic.c
@@ -5,7 +5,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
 static char elsieid[] = "@(#)zic.c	7.113";
-static char rcsid[] = "$OpenBSD: zic.c,v 1.21 2003/10/06 00:17:13 millert Exp $";
+static char rcsid[] = "$OpenBSD: zic.c,v 1.22 2004/04/01 11:37:02 jmc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "private.h"
@@ -450,7 +450,7 @@ const char * const	string;
 static void
 usage P((void))
 {
-	(void) fprintf(stderr, _("%s: usage is %s [-sv] [-l localtime] [-p posixrules] [-d directory]\n\t[-L leapseconds] [-y yearistype] [filename ...]\n"),
+	(void) fprintf(stderr, _("%s: usage is %s [-sv] [-d directory] [-L leapsecondfilename] [-l timezone]\n\t[-p timezone] [-y command] [filename ...]\n"),
 		progname, progname);
 	(void) exit(EXIT_FAILURE);
 }