diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 9629756e15e2..7cc617ffa353 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -333,8 +333,8 @@ RTM_CHANGE.
 As such, only the super-user may modify
 the routing tables.
 .Sh DIAGNOSTICS
-.Bl -tag -width Ds
-.It Sy "add [host \&| network ] %s: gateway %s flags %x"
+.Bl -diag
+.It "add [host \&| network ] %s: gateway %s flags %x"
 The specified route is being added to the tables.  The
 values printed are from the routing table entry supplied
 in the 
@@ -344,21 +344,21 @@ If the gateway address used was not the primary address of the gateway
 (the first one returned by
 .Xr gethostbyname 3 ) ,
 the gateway address is printed numerically as well as symbolically.
-.It Sy "delete [ host \&| network ] %s: gateway %s flags %x" 
+.It "delete [ host \&| network ] %s: gateway %s flags %x" 
 As above, but when deleting an entry.
-.It Sy "%s %s done"
+.It "%s %s done"
 When the 
 .Cm flush
 command is specified, each routing table entry deleted
 is indicated with a message of this form.
-.It Sy "Network is unreachable"
+.It "Network is unreachable"
 An attempt to add a route failed because the gateway listed was not
 on a directly-connected network.
 The next-hop gateway must be given.
-.It Sy "not in table"
+.It "not in table"
 A delete operation was attempted for an entry which
 wasn't present in the tables.
-.It Sy "routing table overflow"
+.It "routing table overflow"
 An add operation was attempted, but the system was
 low on resources and was unable to allocate memory
 to create the new entry.
diff --git a/share/man/man4/gusc.4 b/share/man/man4/gusc.4
index 65ebe15aa2f2..49ef399fd8a0 100644
--- a/share/man/man4/gusc.4
+++ b/share/man/man4/gusc.4
@@ -55,9 +55,8 @@ If the secondary
 DMA channel is C, set the flags to (C | 0x10). For a sound card without the
 secondary DMA channel, the flags should be set to zero.
 .Sh DIAGNOSTICS
-.Bl -tag -width 2m
+.Bl -diag
 .It xxx: gus pcm not attached, out of memory
-.Pp
 There are not enough memory to drive the device.
 .El
 .Sh HISTORY
diff --git a/share/man/man4/sbc.4 b/share/man/man4/sbc.4
index 7f44313eefa9..fc504f9b5997 100644
--- a/share/man/man4/sbc.4
+++ b/share/man/man4/sbc.4
@@ -57,13 +57,11 @@ If the secondary
 DMA channel is C, set the flags to (C | 0x10). For a sound card without the
 secondary DMA channel, the flags should be set to zero.
 .Sh DIAGNOSTICS
-.Bl -tag -width 2m
+.Bl -diag
 .It sb_dspwr(XX) timed out.
-.Pp
 A command to the DSP has timed out.
 Check the I/O port configuration.
 .It bad irq XX (5/7/9/10 valid)
-.Pp
 The IRQ given to the driver is not valid.
 .El
 .Sh HISTORY
diff --git a/share/man/man4/snd_gusc.4 b/share/man/man4/snd_gusc.4
index 65ebe15aa2f2..49ef399fd8a0 100644
--- a/share/man/man4/snd_gusc.4
+++ b/share/man/man4/snd_gusc.4
@@ -55,9 +55,8 @@ If the secondary
 DMA channel is C, set the flags to (C | 0x10). For a sound card without the
 secondary DMA channel, the flags should be set to zero.
 .Sh DIAGNOSTICS
-.Bl -tag -width 2m
+.Bl -diag
 .It xxx: gus pcm not attached, out of memory
-.Pp
 There are not enough memory to drive the device.
 .El
 .Sh HISTORY
diff --git a/share/man/man4/snd_sbc.4 b/share/man/man4/snd_sbc.4
index 7f44313eefa9..fc504f9b5997 100644
--- a/share/man/man4/snd_sbc.4
+++ b/share/man/man4/snd_sbc.4
@@ -57,13 +57,11 @@ If the secondary
 DMA channel is C, set the flags to (C | 0x10). For a sound card without the
 secondary DMA channel, the flags should be set to zero.
 .Sh DIAGNOSTICS
-.Bl -tag -width 2m
+.Bl -diag
 .It sb_dspwr(XX) timed out.
-.Pp
 A command to the DSP has timed out.
 Check the I/O port configuration.
 .It bad irq XX (5/7/9/10 valid)
-.Pp
 The IRQ given to the driver is not valid.
 .El
 .Sh HISTORY
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index e0451391ff99..5b4ce5331e14 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -67,7 +67,7 @@ otherhost   7:36am  up 6 days, 16:45,  load average: 0.20, 0.23, 0.18
 example%
 .Ed
 .Sh DIAGNOSTICS
-.Bl -tag -width indent
+.Bl -diag
 .It rup: RPC: Program not registered
 The
 .Xr rpc.rstatd 8
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index d075288dd721..7e8a2f2d14a5 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -75,17 +75,17 @@ logged in, the amount of time since the user typed on the keyboard,
 and the remote host they logged in from (if applicable).
 .El
 .Sh DIAGNOSTICS
-.Bl -tag -width indent
-.It Nm Ns : RPC: Program not registered
+.Bl -diag
+.It rusers: RPC: Program not registered
 The
 .Xr rpc.rusersd 8
 daemon has not been started on the remote host.
-.It Nm Ns : RPC: Timed out
+.It rusers: RPC: Timed out
 A communication error occurred.  Either the network is
 excessively congested, or the
 .Xr rpc.rusersd 8
 daemon has terminated on the remote host.
-.It Nm Ns : "RPC: Port mapper failure - RPC: Timed out"
+.It rusers: "RPC: Port mapper failure - RPC: Timed out"
 The remote host is not running the portmapper (see
 .Xr portmap 8 ) ,
 and cannot accommodate any RPC-based services.  The host may be down.
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index c22b13a94c64..604729c755f2 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -52,7 +52,7 @@ message to be sent can be typed in and terminated with EOF or it can
 be in a
 .Ar file .
 .Sh DIAGNOSTICS
-.Bl -tag -width indent
+.Bl -diag
 .It rwall: RPC: Program not registered
 The
 .Xr rpc.rwalld 8
diff --git a/usr.sbin/lpr/lpc/lpc.8 b/usr.sbin/lpr/lpc/lpc.8
index 76782bac5564..542f0d738881 100644
--- a/usr.sbin/lpr/lpc/lpc.8
+++ b/usr.sbin/lpr/lpc/lpc.8
@@ -195,12 +195,12 @@ lock file for queue control
 .Xr printcap 5 ,
 .Xr lpd 8
 .Sh DIAGNOSTICS
-.Bl -tag -width indent
-.It Sy "?Ambiguous command"
+.Bl -diag
+.It "?Ambiguous command"
 abbreviation matches more than one command
-.It Sy "?Invalid command"
+.It "?Invalid command"
 no match was found
-.It Sy "?Privileged command"
+.It "?Privileged command"
 you must be a member of group "operator" or root to execute this command
 .El
 .Sh HISTORY
diff --git a/usr.sbin/timed/timedc/timedc.8 b/usr.sbin/timed/timedc/timedc.8
index 6e9327989145..29f54bf9bbd2 100644
--- a/usr.sbin/timed/timedc/timedc.8
+++ b/usr.sbin/timed/timedc/timedc.8
@@ -128,7 +128,7 @@ log file for master timed
 .%A S. Zatti
 .Re
 .Sh DIAGNOSTICS
-.Bl -tag -width Ds -compact
+.Bl -diag
 .It ?Ambiguous command
 abbreviation matches more than one command
 .It ?Invalid command
diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index 8392ba43149d..bfb7e09e89ae 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -133,8 +133,8 @@ arguments may be used to supplant the defaults.
 .Xr netstat 1 ,
 .Xr setsockopt 2
 .Sh DIAGNOSTICS
-.Bl -tag -width Ds
-.It Sy no namelist
+.Bl -diag
+.It no namelist
 When the system image doesn't
 contain the proper symbols to find the trace buffer;
 others which should be self explanatory.