sync the synopsis and usage of commands

ok jmc@

12 files changed, 40 insertions, 41 deletions

diff --git a/bin/chio/chio.1 b/bin/chio/chio.1
index 5b257ec8ae5..fc6d1479b02 100644
--- a/bin/chio/chio.1
+++ b/bin/chio/chio.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chio.1,v 1.28 2007/05/31 19:19:13 jmc Exp $
+.\"	$OpenBSD: chio.1,v 1.29 2007/10/16 20:19:26 sobrado Exp $
 .\"	$NetBSD: chio.1,v 1.1.1.1 1996/04/03 00:34:38 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: October 16 2007 $
 .Dt CHIO 1
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nm chio
 .Op Fl f Ar changer
 .Ar command
-.Op Ar argument ...
+.Op Ar arg ...
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/bin/chio/chio.c b/bin/chio/chio.c
index 93b1c45adee..20388d1a623 100644
--- a/bin/chio/chio.c
+++ b/bin/chio/chio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chio.c,v 1.20 2006/06/14 02:14:25 krw Exp $	*/
+/*	$OpenBSD: chio.c,v 1.21 2007/10/16 20:19:26 sobrado Exp $	*/
 /*	$NetBSD: chio.c,v 1.1.1.1 1996/04/03 00:34:38 thorpej Exp $	*/
 
 /*
@@ -838,7 +838,7 @@ usage(void)
 {
 	int i;
 
-	fprintf(stderr, "usage: %s [-f device] command [args ...]\n",
+	fprintf(stderr, "usage: %s [-f changer] command [arg ...]\n",
 	    __progname);
 	fprintf(stderr, "commands:");
 	for (i = 0; commands[i].cc_name; i++)
diff --git a/bin/date/date.c b/bin/date/date.c
index 699997876ef..15ff8fa0415 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: date.c,v 1.29 2007/05/25 20:18:00 millert Exp $	*/
+/*	$OpenBSD: date.c,v 1.30 2007/10/16 20:19:26 sobrado Exp $	*/
 /*	$NetBSD: date.c,v 1.11 1995/09/07 06:21:05 jtc Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)date.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: date.c,v 1.29 2007/05/25 20:18:00 millert Exp $";
+static char rcsid[] = "$OpenBSD: date.c,v 1.30 2007/10/16 20:19:26 sobrado Exp $";
 #endif
 #endif /* not lint */
 
@@ -265,7 +265,7 @@ static void
 usage(void)
 {
 	(void)fprintf(stderr,
-	    "usage: %s [-ajnu] [-d dst] [-r seconds] [-t west] [+format]\n",
+	    "usage: %s [-ajnu] [-d dst] [-r seconds] [-t minutes_west] [+format]\n",
 	     __progname);
 	(void)fprintf(stderr,
 	    "%-*s[[[[[[cc]yy]mm]dd]HH]MM[.SS]]\n", strlen(__progname) + 8, "");
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index b3f6df739cd..b0dec7c8f29 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhclient.c,v 1.115 2007/09/02 15:19:23 deraadt Exp $	*/
+/*	$OpenBSD: dhclient.c,v 1.116 2007/10/16 20:19:26 sobrado Exp $	*/
 
 /*
  * Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -397,8 +397,8 @@ usage(void)
 {
 	extern char	*__progname;
 
-	fprintf(stderr, "usage: %s [-dqu] ", __progname);
-	fprintf(stderr, "[-c conffile] [-l leasefile] interface\n");
+	fprintf(stderr, "usage: %s [-dqu] [-c file] [-l file] interface\n",
+	    __progname);
 	exit(1);
 }
 
diff --git a/sbin/iopctl/iopctl.8 b/sbin/iopctl/iopctl.8
index a41b5666c02..86135c92baf 100644
--- a/sbin/iopctl/iopctl.8
+++ b/sbin/iopctl/iopctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: iopctl.8,v 1.9 2007/05/31 19:19:44 jmc Exp $
+.\"	$OpenBSD: iopctl.8,v 1.10 2007/10/16 20:19:27 sobrado Exp $
 .\"	$NetBSD: iopctl.8,v 1.4 2001/03/20 13:07:51 ad Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: October 16 2007 $
 .Dt IOPCTL 8
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@
 .Nd a program to control IOP devices
 .Sh SYNOPSIS
 .Nm iopctl
-.Op Fl f Ar ctldev
+.Op Fl f Ar device
 .Ar command
 .Op Ar tid
 .Sh DESCRIPTION
@@ -53,7 +53,7 @@ command can be used to interrogate and control I2O devices.
 .Pp
 The following options are available:
 .Bl -tag -width xxxxxxxxxxx
-.It Fl f Ar ctldev
+.It Fl f Ar device
 Specify the control device to use.
 The default is
 .Pa /dev/iop0 .
diff --git a/sbin/iopctl/iopctl.c b/sbin/iopctl/iopctl.c
index b775a715dc0..de3132eee8e 100644
--- a/sbin/iopctl/iopctl.c
+++ b/sbin/iopctl/iopctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iopctl.c,v 1.8 2007/10/08 08:19:40 gilles Exp $	*/
+/*	$OpenBSD: iopctl.c,v 1.9 2007/10/16 20:19:27 sobrado Exp $	*/
 /*	$NetBSD: iopctl.c,v 1.12 2002/01/04 10:17:20 ad Exp $	*/
 
 /*-
@@ -160,7 +160,7 @@ usage(void)
 {
 	extern const char *__progname;
 
-	(void)fprintf(stderr, "usage: %s [-f dev] <command> [target]\n",
+	(void)fprintf(stderr, "usage: %s [-f device] command [tid]\n",
 	    __progname);
 	exit(EXIT_FAILURE);
 	/* NOTREACHED */
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 9b99c559a25..8100cecb635 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount.c,v 1.46 2007/09/02 15:19:24 deraadt Exp $	*/
+/*	$OpenBSD: mount.c,v 1.47 2007/10/16 20:19:27 sobrado Exp $	*/
 /*	$NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount.c	8.19 (Berkeley) 4/19/94";
 #else
-static char rcsid[] = "$OpenBSD: mount.c,v 1.46 2007/09/02 15:19:24 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mount.c,v 1.47 2007/10/16 20:19:27 sobrado Exp $";
 #endif
 #endif /* not lint */
 
@@ -712,11 +712,9 @@ usage(void)
 {
 
 	(void)fprintf(stderr,
-	    "usage: mount %s %s\n       mount %s\n       mount %s\n",
-	    "[-dfruvw] [-o options] [-t ffs | external_type]",
-	    "special node",
-	    "[-Aadfruvw] [-t ffs | external_type]",
-	    "[-dfrsuvw] special | node");
+	    "usage: mount [-Aadfruvw] [-t type]\n"
+	    "       mount [-dfrsuvw] special | node\n"
+	    "       mount [-dfruvw] [-o options] [-t type] special node\n");
 	exit(1);
 }
 
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 278117701ff..4406f0698a2 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nohup.c,v 1.12 2003/06/03 02:56:14 millert Exp $	*/
+/*	$OpenBSD: nohup.c,v 1.13 2007/10/16 20:19:27 sobrado Exp $	*/
 /*	$NetBSD: nohup.c,v 1.6 1995/08/31 23:35:25 jtc Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)nohup.c	5.4 (Berkeley) 6/1/90";
 #endif
-static char rcsid[] = "$OpenBSD: nohup.c,v 1.12 2003/06/03 02:56:14 millert Exp $";
+static char rcsid[] = "$OpenBSD: nohup.c,v 1.13 2007/10/16 20:19:27 sobrado Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -138,6 +138,6 @@ dupit:
 __dead static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: nohup command\n");
+	(void)fprintf(stderr, "usage: nohup utility [arg ...]\n");
 	exit(EXIT_MISC);
 }
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index 75fcbbf5e76..7d6423f8505 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.11 2007/03/20 06:07:57 ray Exp $	*/
+/*	$OpenBSD: main.c,v 1.12 2007/10/16 20:19:27 sobrado Exp $	*/
 
 /*-
  * Copyright (c) 1992 Diomidis Spinellis.
@@ -38,7 +38,7 @@ static const char copyright[] =
 "@(#) Copyright (c) 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 /* from: static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 1/3/94"; */
-static const char rcsid[] = "$OpenBSD: main.c,v 1.11 2007/03/20 06:07:57 ray Exp $";
+static const char rcsid[] = "$OpenBSD: main.c,v 1.12 2007/10/16 20:19:27 sobrado Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -126,7 +126,8 @@ main(int argc, char *argv[])
 		default:
 		case '?':
 			(void)fprintf(stderr,
-"usage:\tsed script [-anu] [file ...]\n\tsed [-anu] [-e script] ... [-f script_file] ... [file ...]\n");
+			    "usage: sed [-anu] command [file ...]\n"
+			    "       sed [-anu] [-e command] [-f command_file] [file ...]\n");
 			exit(1);
 		}
 	argc -= optind;
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 97feb99a1b1..b584c5731da 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sed.1,v 1.28 2007/05/31 19:20:15 jmc Exp $
+.\"	$OpenBSD: sed.1,v 1.29 2007/10/16 20:19:27 sobrado Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	from: @(#)sed.1	8.2 (Berkeley) 12/30/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: October 16 2007 $
 .Dt SED 1
 .Os
 .Sh NAME
@@ -42,12 +42,12 @@
 .Nm sed
 .Op Fl anu
 .Ar command
-.Op Ar file ...
+.Op Ar
 .Nm sed
 .Op Fl anu
 .Op Fl e Ar command
 .Op Fl f Ar command_file
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1
index 82b06546631..fb32cc21c9b 100644
--- a/usr.bin/ul/ul.1
+++ b/usr.bin/ul/ul.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ul.1,v 1.13 2007/05/31 19:20:18 jmc Exp $
+.\"	$OpenBSD: ul.1,v 1.14 2007/10/16 20:19:27 sobrado Exp $
 .\"	$NetBSD: ul.1,v 1.3 1994/12/07 00:28:23 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)ul.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: October 16 2007 $
 .Dt UL 1
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nm ul
 .Op Fl i
 .Op Fl t Ar terminal
-.Op Ar name Ar ...
+.Op Ar
 .Sh DESCRIPTION
 .Nm
 reads the named files (or standard input if none are given)
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index 3306f8ec04b..aacb5fc1373 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ul.c,v 1.13 2004/07/06 14:37:59 jaredy Exp $	*/
+/*	$OpenBSD: ul.c,v 1.14 2007/10/16 20:19:27 sobrado Exp $	*/
 /*	$NetBSD: ul.c,v 1.3 1994/12/07 00:28:24 jtc Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ static const char copyright[] =
 #if 0
 static char sccsid[] = "@(#)ul.c	8.1 (Berkeley) 6/6/93";
 #endif
-static const char rcsid[] = "$OpenBSD: ul.c,v 1.13 2004/07/06 14:37:59 jaredy Exp $";
+static const char rcsid[] = "$OpenBSD: ul.c,v 1.14 2007/10/16 20:19:27 sobrado Exp $";
 #endif /* not lint */
 
 #include <curses.h>
@@ -128,8 +128,8 @@ main(int argc, char *argv[])
 
 		default:
 			fprintf(stderr,
-				"usage: %s [-i] [-t terminal] file...\n",
-				argv[0]);
+			    "usage: %s [-i] [-t terminal] [file ...]\n",
+			    argv[0]);
 			exit(1);
 		}