sync the synopsis and usage of commands

ok jmc@

4 files changed, 14 insertions, 16 deletions

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);
 }