- do not list -f option for eject, as it is not necessary

- tidy up the options list somewhat to avoid confusion
- sync usage()

started by a diff from tom@ and ok'd by him;

2 files changed, 10 insertions, 11 deletions

diff --git a/bin/mt/mt.1 b/bin/mt/mt.1
index d9368518ca0..424818bb18b 100644
--- a/bin/mt/mt.1
+++ b/bin/mt/mt.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mt.1,v 1.21 2003/07/31 14:12:21 jmc Exp $
+.\"	$OpenBSD: mt.1,v 1.22 2005/04/26 16:23:48 jmc Exp $
 .\"	$NetBSD: mt.1,v 1.8 1996/05/21 10:23:55 mrg Exp $
 .\"
 .\" Copyright (c) 1981, 1990, 1993
@@ -43,7 +43,6 @@
 .Ar command
 .Op Ar count
 .Nm eject
-.Op Fl f
 .Ar device
 .Sh DESCRIPTION
 The
@@ -76,20 +75,20 @@ command specified.
 .Nm eject
 may also be used to eject other types of removable media.
 .Pp
-The options are as follows:
-.Pp
-.Bl -tag -width Ds
+The options for
+.Nm
+are as follows:
+.Bl -tag -width "-f deviceXX"
 .It Fl f Ar device
 Operate on the
 .Ar device
 specified.
-.El
-.Pp
 If the
 .Fl f
 flag is passed to
 .Nm eject ,
 it is silently ignored.
+.El
 .Pp
 The available commands are listed below.
 Only as many characters as are required to uniquely identify a command
diff --git a/bin/mt/mt.c b/bin/mt/mt.c
index 61b59937089..c517d8c8de5 100644
--- a/bin/mt/mt.c
+++ b/bin/mt/mt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mt.c,v 1.23 2003/06/02 23:32:08 millert Exp $	*/
+/*	$OpenBSD: mt.c,v 1.24 2005/04/26 16:23:48 jmc Exp $	*/
 /*	$NetBSD: mt.c,v 1.14.2.1 1996/05/27 15:12:11 mrg Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mt.c	8.2 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: mt.c,v 1.23 2003/06/02 23:32:08 millert Exp $";
+static char rcsid[] = "$OpenBSD: mt.c,v 1.24 2005/04/26 16:23:48 jmc Exp $";
 #endif
 #endif /* not lint */
 
@@ -298,9 +298,9 @@ void
 usage(void)
 {
 	if (eject)
-		(void)fprintf(stderr, "usage: %s [-f] device\n", progname);
+		(void)fprintf(stderr, "usage: %s device\n", progname);
 	else
 		(void)fprintf(stderr,
-		    "usage: %s [-f device] command [ count ]\n", progname);
+		    "usage: %s [-f device] command [count]\n", progname);
 	exit(X_USAGE);
 }