(1) Make usage() and SYNOPSIS agree with each other.

(2) Use 'device' instead of 'device name', there seems to be a precedent in
    /usr/share/man/man1

Prompted By:	bde

2 files changed, 8 insertions, 9 deletions

diff --git a/usr.sbin/cdcontrol/cdcontrol.1 b/usr.sbin/cdcontrol/cdcontrol.1
index 5bab682..22e788f 100644
--- a/usr.sbin/cdcontrol/cdcontrol.1
+++ b/usr.sbin/cdcontrol/cdcontrol.1
@@ -1,4 +1,4 @@
-.\"	$Id: cdcontrol.1,v 1.16 1998/06/13 19:28:51 steve Exp $
+.\"	$Id: cdcontrol.1,v 1.17 1999/01/31 03:35:17 billf Exp $
 .\"
 .Dd July 3, 1995
 .Dt CDCONTROL 1
@@ -8,10 +8,9 @@
 .Nd compact disc control utility
 .Sh SYNOPSIS
 .Nm cdcontrol
-.Op Fl s
-.Op Fl v
-.Op Fl f Ar devicename
-.Op Ar command args ...
+.Op Fl sv
+.Op Fl f Ar device
+.Op Ar command ...
 .Sh DESCRIPTION
 .Nm Cdcontrol
 is a program to control audio features of a CD drive. The device is a name such
@@ -38,8 +37,8 @@ The following options are available:
 Silent mode - do not print table headers and human readable comments.
 .It Fl v
 Verbose mode - print as much information as possible.
-.It Fl f Ar devicename
-Specify a device name, such as
+.It Fl f Ar device
+Specify a device, such as
 .Pa /dev/cd0c
 or
 .Pa mcd0 .
diff --git a/usr.sbin/cdcontrol/cdcontrol.c b/usr.sbin/cdcontrol/cdcontrol.c
index fc375ee..121600d 100644
--- a/usr.sbin/cdcontrol/cdcontrol.c
+++ b/usr.sbin/cdcontrol/cdcontrol.c
@@ -20,7 +20,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: cdcontrol.c,v 1.16 1997/09/04 11:52:28 charnier Exp $";
+	"$Id: cdcontrol.c,v 1.17 1998/01/26 00:57:54 jmz Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
@@ -149,7 +149,7 @@ void help ()
 
 void usage ()
 {
-	fprintf (stderr, "usage: cdcontrol [-vs] [-f disc] [command args ...]\n");
+	fprintf (stderr, "usage: cdcontrol [-sv] [-f device] [command ...]\n");
 	exit (1);
 }