2 files changed, 8 insertions, 8 deletions

diff --git a/sbin/scsiformat/scsiformat.8 b/sbin/scsiformat/scsiformat.8
index b781699d5949..d0f18c150ab4 100644
--- a/sbin/scsiformat/scsiformat.8
+++ b/sbin/scsiformat/scsiformat.8
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)scsiformat.8	5.1 (Berkeley) 6/5/93
+.\"	$Id$
 .\"
 .Dd June 5, 1993
 .Dt SCSIFORMAT 8
@@ -39,8 +40,7 @@
 .Nd format SCSI disks and show SCSI parameters
 .Sh SYNOPSIS
 .Nm scsiformat
-.Op Fl w
-.Op Fl q
+.Op Fl qw
 .Op Fl p Ar page-control
 .Ar device-name
 .Sh DESCRIPTION
@@ -77,13 +77,13 @@ gets saved settings (those that persist across power cycles).
 .It Li v
 shows which parameters are variable.
 .El
-.It Fl w
-Do actually format; by default, only the disk parameters will be
-displayed.
 .It Fl q
 Quiet; suppress the mode page output.  Only the inquiry string will be
 printed, so the operator can ensure he's going to format the intended
 drive.
+.It Fl w
+Do actually format; by default, only the disk parameters will be
+displayed.
 .El
 .Sh DIAGNOSTICS
 These should mostly be self-explanatory.
diff --git a/sbin/scsiformat/scsiformat.sh b/sbin/scsiformat/scsiformat.sh
index 5c6dd88bf67c..9d2c13293a1e 100644
--- a/sbin/scsiformat/scsiformat.sh
+++ b/sbin/scsiformat/scsiformat.sh
@@ -26,9 +26,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # 
-# $Id$
+# $Id: scsiformat.sh,v 1.1 1995/09/17 12:47:01 joerg Exp $
 #
-# scsiformat [-wq] [-p page-control] raw-device-name
+# scsiformat [-qw] [-p page-control] raw-device-name
 #
 
 PATH="/sbin:/usr/sbin:/bin:/usr/bin"; export PATH
@@ -40,7 +40,7 @@ PAGE=0
 
 usage()
 {
-	echo "Usage: scsiformat [-wq] [-p page-control] raw-device-name" 1>&2
+	echo "usage: scsiformat [-qw] [-p page-control] raw-device-name" 1>&2
 	exit 2
 }