diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index d8957ef..dba10d9 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -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,14 @@ The options are as follows:
 Repeat the display
 .Ar count
 times.
-If no repeat
+If
 .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.
+is not specified and a
+.Ar wait
+interval is specified, the default repeat count is infinity.
+If no
+.Ar wait
+interval is specified, the default repeat count is 1.
 .It Fl C
 Display CPU statistics.
 This is on by default, unless
@@ -132,7 +137,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
+In the blocks transferred display
+.Pq Fl o ,
+display block count in kilobytes rather
 then the device native block size.
 .It Fl M
 Extract values associated with the name list from the specified core
@@ -241,9 +248,9 @@ is specified.
 Pause
 .Ar wait
 seconds between each display.
-If no
+If
 .Ar wait
-interval is specified, the default is 1 second.
+is not specified, the default interval is 1 second.
 .Pp
 The
 .Nm
@@ -487,3 +494,20 @@ 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