tidy up synopsis and usage(); reported by Igor Sobrado

2 files changed, 20 insertions, 19 deletions

diff --git a/usr.sbin/fdformat/fdformat.1 b/usr.sbin/fdformat/fdformat.1
index 4b46a217d6b..19303b26678 100644
--- a/usr.sbin/fdformat/fdformat.1
+++ b/usr.sbin/fdformat/fdformat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fdformat.1,v 1.15 2006/04/17 15:13:51 steven Exp $
+.\"	$OpenBSD: fdformat.1,v 1.16 2007/02/19 21:32:35 jmc Exp $
 .\"
 .\" Copyright (C) 1993, 1994 by Joerg Wunsch, Dresden
 .\" All rights reserved.
@@ -33,16 +33,15 @@
 .Sh SYNOPSIS
 .Nm fdformat
 .Bk -words
-.Op Fl q
-.Op Fl n | v
+.Op Fl nqv
 .Op Fl c Ar cyls
-.Op Fl s Ar secs
-.Op Fl h Ar heads
-.Op Fl r Ar rate
+.Op Fl F Ar fillbyte
 .Op Fl g Ar gap3len
+.Op Fl h Ar heads
 .Op Fl i Ar intleave
+.Op Fl r Ar rate
 .Op Fl S Ar secshft
-.Op Fl F Ar fillbyte
+.Op Fl s Ar secs
 .Op Fl t Ar steps_per_track
 .Ar device_name
 .Ek
@@ -76,13 +75,13 @@ Don't verify floppy after formatting.
 Don't format; verify only.
 .Pp
 .It Fl c Ar cyls
-.It Fl s Ar secs
-.It Fl h Ar heads
-.It Fl r Ar rate
+.It Fl F Ar fillbyte
 .It Fl g Ar gap3len
+.It Fl h Ar heads
 .It Fl i Ar intleave
+.It Fl r Ar rate
 .It Fl S Ar secshft
-.It Fl F Ar fillbyte
+.It Fl s Ar secs
 .It Fl t Ar steps_per_track
 An alternate method to specify the geometry data to write to the floppy disk.
 .El
diff --git a/usr.sbin/fdformat/fdformat.c b/usr.sbin/fdformat/fdformat.c
index 26ca05ebee2..7919958f183 100644
--- a/usr.sbin/fdformat/fdformat.c
+++ b/usr.sbin/fdformat/fdformat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdformat.c,v 1.15 2006/08/07 18:20:57 miod Exp $	*/
+/*	$OpenBSD: fdformat.c,v 1.16 2007/02/19 21:32:35 jmc Exp $	*/
 
 /*
  * Copyright (C) 1992-1994 by Joerg Wunsch, Dresden
@@ -132,23 +132,25 @@ verify_track(int fd, int track, int tracksize)
 static void
 usage(void)
 {
-	printf("Usage:\n\t%s [-q] [-n | -v] [-c #] [-s #] [-h #]\n",
+	printf("usage: %s [-nqv] [-c cyls] [-F fillbyte] [-g gap3len] ",
 		__progname);
-	printf("\t\t [-r #] [-g #] [-i #] [-S #] [-F #] [-t #] devname\n");
+	printf("[-h heads]\n");
+	printf("\t[-i intleave] [-r rate] [-S secshft] [-s secs]\n");
+	printf("\t[-t steps_per_track] device_name\n");
 	printf("Options:\n");
-	printf("\t-q\tsupress any normal output, don't ask for confirmation\n");
 	printf("\t-n\tdon't verify floppy after formatting\n");
+	printf("\t-q\tsupress any normal output, don't ask for confirmation\n");
 	printf("\t-v\tdon't format, verify only\n");
 	printf("\tdevname\tthe full name of floppy device or in short form fd0, fd1\n");
 	printf("Obscure options:\n");
 	printf("\t-c #\tspecify number of cylinders, 40 or 80\n");
-	printf("\t-s #\tspecify number of sectors per track, 9, 10, 15 or 18\n");
-	printf("\t-h #\tspecify number of floppy heads, 1 or 2\n");
-	printf("\t-r #\tspecify data rate, 250, 300 or 500 kbps\n");
+	printf("\t-F #\tspecify fill byte\n");
 	printf("\t-g #\tspecify gap length\n");
+	printf("\t-h #\tspecify number of floppy heads, 1 or 2\n");
 	printf("\t-i #\tspecify interleave factor\n");
+	printf("\t-r #\tspecify data rate, 250, 300 or 500 kbps\n");
 	printf("\t-S #\tspecify sector size, 0=128, 1=256, 2=512 bytes\n");
-	printf("\t-F #\tspecify fill byte\n");
+	printf("\t-s #\tspecify number of sectors per track, 9, 10, 15 or 18\n");
 	printf("\t-t #\tnumber of steps per track\n");
 	exit(2);
 }