diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index d8957ef..db96306 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -56,7 +56,7 @@
 .\"
 .\"	@(#)iostat.8	8.1 (Berkeley) 6/6/93
 .\"
-.Dd November 24, 2010
+.Dd April 4, 2011
 .Dt IOSTAT 8
 .Os
 .Sh NAME
@@ -69,8 +69,8 @@ statistics
 .Op Fl CdhIKoTxz?\&
 .Op Fl c Ar count
 .Op Fl M Ar core
-.Op Fl n Ar devs
 .Op Fl N Ar system
+.Op Fl n Ar devs
 .Oo
 .Fl t
 .Sm off
@@ -85,8 +85,13 @@ The
 utility displays kernel
 .Tn I/O
 statistics on terminal, device and cpu operations.
-The first statistics that are printed are averaged over the system uptime.
-To get information about the current activity, a suitable wait time should
+The first statistics that are printed are averaged over the system uptime
+(unless
+.Fl I
+is specified).
+Any references to repetitions in this man page implicitly include the first
+statistics output.
+To get information about the ongoing activity, a suitable wait time should
 be specified, so that the subsequent sets of printed statistics will be
 averaged over that time.
 .Pp
@@ -96,14 +101,11 @@ The options are as follows:
 Repeat the display
 .Ar count
 times.
-If no repeat
-.Ar count
-is specified, the default depends on whether
-.Fl w
-is specified.
-With
-.Fl w
-the default repeat count is infinity, otherwise it is 1.
+If
+.Fl c
+is not specified and a wait interval is specified,
+the default repeat count is infinity.
+If no wait interval is specified, the default repeat count is 1.
 .It Fl C
 Display CPU statistics.
 This is on by default, unless
@@ -132,8 +134,9 @@ per measurement cycle.
 Display total statistics for a given time period, rather than average
 statistics for each second during that time period.
 .It Fl K
-In the blocks transferred display (-o), display block count in kilobytes rather
-then the device native block size.
+In the blocks transferred display
+.Pq Fl o ,
+display block count in kilobytes rather than the device native block size.
 .It Fl M
 Extract values associated with the name list from the specified core
 instead of the default
@@ -144,7 +147,7 @@ Display up to
 number of devices.
 The
 .Nm
-utility will display fewer devices if there are not
+utility will display fewer devices if there are less than
 .Ar devs
 devices present.
 .It Fl N
@@ -215,7 +218,7 @@ Passthrough devices
 The user must specify at least one device type, and may specify at most
 one device type from each category.
 Multiple device types in a single device type statement must be separated by
-commas.
+commas and are ANDed together.
 .Pp
 Any number of
 .Fl t
@@ -229,7 +232,9 @@ Any device that fully matches any
 argument will be included in the
 .Nm
 output, up to the number of devices that can be displayed in
-80 columns, or the maximum number of devices specified by the user.
+80 columns, or the maximum number of devices
+.Pq Fl n
+specified by the user.
 .It Fl T
 Display TTY statistics.
 This is on by default, unless
@@ -241,9 +246,9 @@ is specified.
 Pause
 .Ar wait
 seconds between each display.
-If no
-.Ar wait
-interval is specified, the default is 1 second.
+If
+.Fl w
+is not specified, the default interval is 1 second.
 .Pp
 The
 .Nm
@@ -345,9 +350,9 @@ total number of megabytes transferred
 .Pp
 The extended
 .Nm
-device display, with the
-.Fl x
-flag specified, shows the following statistics:
+device display
+.Pq Fl x
+shows the following statistics:
 .Pp
 .Bl -tag -width indent -compact
 .It r/s
@@ -366,10 +371,35 @@ average duration of transactions, in milliseconds
 % of time the device had one or more outstanding transactions
 .El
 .Pp
+The extended
+.Nm
+device display
+.Pq Fl x ,
+with the
+.Fl I
+flag specified, shows the following statistics:
+.Pp
+.Bl -tag -width indent -compact
+.It r/i
+total number of read operations
+.It w/i
+total number of write operations
+.It kr/i
+total number of kilobytes read
+.It kw/i
+total number of kilobytes written
+.It qlen
+transactions queue length
+.It svc_t
+average duration of transactions, in milliseconds
+.It %b
+% of time the device had one or more outstanding transactions
+.El
+.Pp
 The old-style
 .Nm
-display (using
-.Fl o )
+device display
+.Pq Fl o
 shows the following statistics:
 .Pp
 .Bl -tag -width indent -compact
@@ -383,7 +413,9 @@ average milliseconds per transaction
 .Pp
 The old-style
 .Nm
-display, with the
+device display
+.Pq Fl o ,
+with the
 .Fl I
 flag specified, shows the following statistics:
 .Pp
@@ -487,3 +519,24 @@ The use of
 as a debugging tool for crash dumps is probably limited because there is
 currently no way to get statistics that only cover the time immediately before
 the crash.
+.Pp
+Each
+.Ar drives
+argument is passed to
+.Fn isdigit .
+If
+.Fn isdigit
+returns true,
+.Nm
+switches into an undocumented traditional syntax and subsequent arguments,
+if any, will not be interpreted as drive names.
+This behavior collides with the one documented in this man page and prevents
+specifying drive names starting with a number.
+E.g., the following
+.Bd -literal -offset indent
+iostat ada0 ada1 2 3 cd0
+.Ed
+.Pp
+This document's use of
+.Dq device type
+is misleading.