Use err(3). Document options in man page, not in usage string.

1 files changed, 26 insertions, 17 deletions

diff --git a/usr.sbin/fdformat/fdformat.1 b/usr.sbin/fdformat/fdformat.1
index 2ea85f5..e4bcff4 100644
--- a/usr.sbin/fdformat/fdformat.1
+++ b/usr.sbin/fdformat/fdformat.1
@@ -30,20 +30,19 @@
 .Nd format floppy disks
 .Sh SYNOPSIS
 .Nm fdformat
-.Bq Fl q
-.Bq Fl v
-.Bq Fl n
-.Bq Fl f Ar capacity
-.Bq Fl c Ar cyls
-.Bq Fl s Ar secs
-.Bq Fl h Ar heads
+.Op Fl q
+.Op Fl v | Fl n
+.Op Fl f Ar capacity
+.Op Fl c Ar cyls
+.Op Fl s Ar secs
+.Op Fl h Ar heads
 .br
-.Bq Fl r Ar rate
-.Bq Fl g Ar gap3len
-.Bq Fl i Ar intleave
-.Bq Fl S Ar secshft
-.Bq Fl F Ar fillbyte
-.Bq Fl t Ar steps_per_track
+.Op Fl r Ar rate
+.Op Fl g Ar gap3len
+.Op Fl i Ar intleave
+.Op Fl S Ar secshft
+.Op Fl F Ar fillbyte
+.Op Fl t Ar steps_per_track
 .Ar device_name
 .Sh DESCRIPTION
 .Nm Fdformat
@@ -69,26 +68,36 @@ are meaningless, since they're overridden by
 The options are as follows:
 .Bl -tag -width 10n -offset indent
 .It Fl q
-suppress any normal output from the command, and don't ask the
+Suppress any normal output from the command, and don't ask the
 user for a confirmation whether to format the floppy disk at
 .Ar device_name .
 .It Fl f Ar capacity
 The normal way to specify the desired formatting parameters.
 .Ar Capacity
-is the number of kilobytes to format.
+is the number of kilobytes to format. Valid choices are 360, 720, 800, 820,
+1200, 1440, 1480 or 1720.
 .It Fl n
 Don't verify floppy after formatting.
 .It Fl v
 Don't format, verify only.
 .It Fl c Ar cyls
+Number of cylinders: 40 or 80.
 .It Fl s Ar secs
+Number of sectors per track: 9, 10, 15 or 18.
 .It Fl h Ar heads
+Number of floppy heads: 1 or 2.
 .It Fl r Ar rate
+Data rate: 250, 300 or 500 kbps.
 .It Fl g Ar gap3len
+Gap length.
 .It Fl i Ar intleave
+Interleave factor.
 .It Fl S Ar secshft
+Sector size: 0=128, 1=256, 2=512 bytes.
 .It Fl F Ar fillbyte
+Fill byte.
 .It Fl t Ar steps_per_track
+Number of steps per track.
 An alternate method to specify the geometry data to write to the floppy disk.
 .El
 
@@ -139,8 +148,8 @@ has been developed for 386BSD 0.1
 and upgraded to the new
 .Xr fd 4
 floppy disk driver. It later became part of the
-.Em FreeBSD
-system, release 1.1.
+.Fx 1.1
+system.
 .Sh AUTHOR
 The program has been contributed by
 .if n Joerg Wunsch,