mdoc(7) police: utilize the new .Ex macro.

62 files changed, 76 insertions, 196 deletions

diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index cf18296..a8eead6 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -97,9 +97,7 @@ characters (with the high bit set) are printed as
 (for meta) followed by the character for the low 7 bits.
 .El
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std
 .Sh EXAMPLES
 The command:
 .Bd -literal -offset indent
diff --git a/bin/chflags/chflags.1 b/bin/chflags/chflags.1
index 4f2b9e7..0ce080f 100644
--- a/bin/chflags/chflags.1
+++ b/bin/chflags/chflags.1
@@ -137,9 +137,7 @@ command's actions are determined by the last one specified.
 .Pp
 You can use "ls -lo" to see the flags of existing files.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr ls 1 ,
 .Xr chflags 2 ,
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index 3fb03ca..8a0123b 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -103,9 +103,7 @@ command's actions are determined by the last one specified.
 Only the owner of a file or the super-user is permitted to change
 the mode of a file.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh MODES
 Modes may be absolute or symbolic.
 An absolute mode is an octal number constructed from the sum of
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index 130eeed..c682ae1 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -213,9 +213,7 @@ option is specified.
 In addition, these options override each other and the
 command's actions are determined by the last one specified.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh COMPATIBILITY
 Historic versions of the
 .Nm
diff --git a/bin/dd/dd.1 b/bin/dd/dd.1
index 8919ff7..0934956 100644
--- a/bin/dd/dd.1
+++ b/bin/dd/dd.1
@@ -347,9 +347,7 @@ in the same format as the standard completion message and
 .Nm
 will exit.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success or >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr cp 1 ,
 .Xr mt 1 ,
diff --git a/bin/echo/echo.1 b/bin/echo/echo.1
index d427529..5426de8 100644
--- a/bin/echo/echo.1
+++ b/bin/echo/echo.1
@@ -72,9 +72,7 @@ Consult the
 .Xr builtin 1
 manual page.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr builtin 1 ,
 .Xr csh 1 ,
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index d86997e..8175980 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -374,9 +374,7 @@ flag to
 may be used
 to get the results sorted from largest to smallest (a reverse sort).
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
 .Nm :
diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1
index 82ca4e5..cf0fe7b 100644
--- a/bin/mkdir/mkdir.1
+++ b/bin/mkdir/mkdir.1
@@ -85,9 +85,7 @@ Be verbose when creating directories, listing them as they are created.
 .Pp
 The user must have write permission in the parent directory.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr rmdir 1
 .Sh COMPATIBILITY
diff --git a/bin/mv/mv.1 b/bin/mv/mv.1
index 6c1cab6..b73c644 100644
--- a/bin/mv/mv.1
+++ b/bin/mv/mv.1
@@ -129,9 +129,7 @@ rm -f destination_path && \e
 \trm -rf source_file
 .Ed
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr cp 1 ,
 .Xr rm 1 ,
diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1
index 52497ec..98fb967 100644
--- a/bin/pwd/pwd.1
+++ b/bin/pwd/pwd.1
@@ -55,9 +55,7 @@ Consult the
 .Xr builtin 1
 manual page.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh STANDARDS
 The
 .Nm
diff --git a/bin/pwd/realpath.1 b/bin/pwd/realpath.1
index 445473d..bbc5a04 100644
--- a/bin/pwd/realpath.1
+++ b/bin/pwd/realpath.1
@@ -58,9 +58,7 @@ and
 in
 .Ar path .
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr realpath 3
 .Sh HISTORY
diff --git a/bin/realpath/realpath.1 b/bin/realpath/realpath.1
index 445473d..bbc5a04 100644
--- a/bin/realpath/realpath.1
+++ b/bin/realpath/realpath.1
@@ -58,9 +58,7 @@ and
 in
 .Ar path .
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr realpath 3
 .Sh HISTORY
diff --git a/bin/setfacl/setfacl.1 b/bin/setfacl/setfacl.1
index 188a783..5d72816 100644
--- a/bin/setfacl/setfacl.1
+++ b/bin/setfacl/setfacl.1
@@ -193,9 +193,7 @@ ACL entries, and
 .Dq Li other
 ACL entry.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility returns 0 on success and >0 if an error occurs.
+.Ex -std
 .Sh EXAMPLES
 .Dl setfacl -m u::rwx,g:mail:rw file
 .Pp
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index d087994..bc3c1f1 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -577,9 +577,7 @@ Same as the control character
 .Cm reprint .
 .El
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr termios 4
 .Sh STANDARDS
diff --git a/sbin/nfsd/nfsd.8 b/sbin/nfsd/nfsd.8
index c62b7d8..666a863 100644
--- a/sbin/nfsd/nfsd.8
+++ b/sbin/nfsd/nfsd.8
@@ -168,10 +168,8 @@ If you have to kill
 .Nm
 just do a
 .Dq Li "kill -USR1 <PID of master nfsd>"
-.Pp
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Sh DIAGNOSTICS
+.Ex -std
 .Sh SEE ALSO
 .Xr nfsstat 1 ,
 .Xr nfssvc 2 ,
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index 46f59ab..e6eeac9 100644
--- a/sbin/nfsiod/nfsiod.8
+++ b/sbin/nfsiod/nfsiod.8
@@ -76,10 +76,8 @@ If this fails, or no
 KLD was available,
 .Nm
 exits with an error.
-.Pp
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Sh DIAGNOSTICS
+.Ex -std
 .Sh SEE ALSO
 .Xr nfsstat 1 ,
 .Xr nfssvc 2 ,
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 5a56e00..226517e 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -378,9 +378,7 @@ same route as the one being changed.
 The next-hop gateway should be reachable through a different route.
 .El
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std
 .Sh SEE ALSO
 .\".Xr esis 4 ,
 .Xr netintro 4 ,
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 2f5e0df..5adf17b 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -270,10 +270,8 @@ The file permissions will be set to those of the file when it was entered
 into the archive; this will fail if the user is not the owner of the
 extracted file or the super-user.
 .El
-.Pp
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Sh DIAGNOSTICS
+.Ex -std
 .Sh ENVIRONMENT
 .Bl -tag -width indent -compact
 .It Ev TMPDIR
diff --git a/usr.bin/ar/ar.1aout b/usr.bin/ar/ar.1aout
index fd11644..1bdebc4 100644
--- a/usr.bin/ar/ar.1aout
+++ b/usr.bin/ar/ar.1aout
@@ -270,10 +270,8 @@ The file permissions will be set to those of the file when it was entered
 into the archive; this will fail if the user is not the owner of the
 extracted file or the super-user.
 .El
-.Pp
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Sh DIAGNOSTICS
+.Ex -std
 .Sh ENVIRONMENT
 .Bl -tag -width indent -compact
 .It Ev TMPDIR
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index 963c6bf..4cb6a25 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -80,11 +80,7 @@ to
 .Pp
 .Dl FOO=`dirname /usr/bin/trail`
 .Sh  DIAGNOSTICS
-Both the
-.Nm
-and
-.Nm dirname
-utilities exit 0 on success, and >0 if an error occurs.
+.Ex -std basename dirname
 .Sh SEE ALSO
 .Xr csh 1 ,
 .Xr sh 1
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index 5bee54f..ce429cb 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.1
+++ b/usr.bin/cap_mkdb/cap_mkdb.1
@@ -90,9 +90,7 @@ The data field of this key/data pair is used to look up a key/data
 pair of the first type which has the real data associated with the
 name.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr dbopen 3 ,
 .Xr getcap 3 ,
diff --git a/usr.bin/chflags/chflags.1 b/usr.bin/chflags/chflags.1
index 4f2b9e7..0ce080f 100644
--- a/usr.bin/chflags/chflags.1
+++ b/usr.bin/chflags/chflags.1
@@ -137,9 +137,7 @@ command's actions are determined by the last one specified.
 .Pp
 You can use "ls -lo" to see the flags of existing files.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr ls 1 ,
 .Xr chflags 2 ,
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index 465bd26..27c4c0b 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -156,11 +156,7 @@ The coefficients of R(x) are considered to be a 32-bit sequence.
 The bit sequence is complemented and the result is the CRC.
 .Ed
 .Sh DIAGNOSTICS
-The
-.Nm
-and
-.Nm sum
-utilities exit 0 on success, and >0 if an error occurs.
+.Ex -std cksum sum
 .Sh SEE ALSO
 .Xr md5 1
 .Pp
diff --git a/usr.bin/column/column.1 b/usr.bin/column/column.1
index 7663536..fc4418b 100644
--- a/usr.bin/column/column.1
+++ b/usr.bin/column/column.1
@@ -75,9 +75,7 @@ Useful for pretty-printing displays.
 Fill columns before filling rows.
 .El
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh ENVIRONMENT
 .Bl -tag -width COLUMNS
 .It Ev COLUMNS
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index 3d0e158..73f4c79 100644
--- a/usr.bin/comm/comm.1
+++ b/usr.bin/comm/comm.1
@@ -84,9 +84,7 @@ printed in column number three will have one.
 assumes that the files are lexically sorted; all characters
 participate in line comparisons.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr cmp 1 ,
 .Xr diff 1 ,
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index 4eb2288..ae2f6bf 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -153,9 +153,7 @@ coding (as used in the historical command pack), or adaptive Huffman
 coding (as used in the historical command compact), and takes less
 time to compute.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Rs
 .%A Welch, Terry A.
diff --git a/usr.bin/gencat/gencat.1 b/usr.bin/gencat/gencat.1
index f4a47f2..e0249a4 100644
--- a/usr.bin/gencat/gencat.1
+++ b/usr.bin/gencat/gencat.1
@@ -154,10 +154,8 @@ is used to continue the line onto the next line, e.g.:
 .Pp
 If the character following the backslash is not one of those specified,
 the backslash is ignored.
-.Pp
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Sh DIAGNOSTICS
+.Ex -std
 .Sh SEE ALSO
 .Xr catclose 3 ,
 .Xr catgets 3 ,
diff --git a/usr.bin/getconf/getconf.1 b/usr.bin/getconf/getconf.1
index d7388fc..c69f625 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -94,9 +94,7 @@ The
 .Fl v Ar environment
 option is not supported, but provided for compatibility purposes.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std
 Use of a
 .Ar system_var
 or
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index 319aa2e..2f9e83d 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -60,10 +60,8 @@ header consisting of the string
 where
 .Dq XXX
 is the name of the file.
-.Pp
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Sh DIAGNOSTICS
+.Ex -std
 .Sh SEE ALSO
 .Xr tail 1
 .Sh HISTORY
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 6179cfc..9219d1d 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -330,9 +330,8 @@ If no format strings are specified, the default display is equivalent
 to specifying the
 .Fl x
 option.
-.Pp
-.Nm
-exits 0 on success and >0 if an error occurred.
+.Sh DIAGNOSTICS
+.Ex -std
 .Sh EXAMPLES
 Display the input in perusal format:
 .Bd -literal -offset indent
diff --git a/usr.bin/id/groups.1 b/usr.bin/id/groups.1
index 3913463..5917442 100644
--- a/usr.bin/id/groups.1
+++ b/usr.bin/id/groups.1
@@ -57,8 +57,6 @@ The
 utility displays the groups to which you (or the optionally specified user)
 belong.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr id 1
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index d4d50e4..f132f46 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -122,9 +122,7 @@ options instead of the effective ID.
 Display the effective user ID as a number.
 .El
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr who 1
 .Sh STANDARDS
diff --git a/usr.bin/id/whoami.1 b/usr.bin/id/whoami.1
index d02ccda..4f7cb53 100644
--- a/usr.bin/id/whoami.1
+++ b/usr.bin/id/whoami.1
@@ -55,8 +55,6 @@ The
 .Nm
 utility displays your effective user ID as a name.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr id 1
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index 57c3b2b..8c71ec0 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -170,9 +170,7 @@ is
 .Dq - ,
 the standard input is used.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh COMPATIBILITY
 For compatibility with historic versions of
 .Nm ,
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index bb4a3fe..e5f9357 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -184,9 +184,7 @@ from column 10 and ending in column 132, use
 and to print all lines 80 characters or longer,
 .Dl grep `jot -s \&"\&" -b \&. 80`
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 The following diagnostic messages deserve special explanation:
 .Bl -diag
 .It "illegal or unsupported format '%s'"
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index e9bfd98..bf9dca0 100644
--- a/usr.bin/logger/logger.1
+++ b/usr.bin/logger/logger.1
@@ -100,9 +100,7 @@ flag is not
 provided, standard input is logged.
 .El
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh EXAMPLES
 .Bd -literal -offset indent -compact
 logger System rebooted
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index 49a75a5..2f187e9 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -58,9 +58,7 @@ and
 environment variables
 because the environment cannot be trusted.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr who 1 ,
 .Xr whoami 1 ,
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index 90fe29d..e637bc6 100644
--- a/usr.bin/mkfifo/mkfifo.1
+++ b/usr.bin/mkfifo/mkfifo.1
@@ -80,9 +80,7 @@ The
 .Nm
 command requires write permission in the parent directory.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh STANDARDS
 The
 .Nm
diff --git a/usr.bin/nl/nl.1 b/usr.bin/nl/nl.1
index 2291ba9..1a29a98 100644
--- a/usr.bin/nl/nl.1
+++ b/usr.bin/nl/nl.1
@@ -221,9 +221,7 @@ The default
 is 6.
 .El
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr pr 1
 .Sh STANDARDS
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index 467bd82..bf575a8 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -111,9 +111,7 @@ input is used; standard input is read one line at a time, circularly,
 for each instance of
 .Ql Fl .
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr cut 1
 .Sh STANDARDS
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 8e0ac07..b33e76d 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -496,9 +496,7 @@ This is the same as specifying the
 option on the command line.
 .El
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr awk 1 ,
 .Xr ed 1 ,
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index 7c74371..0439ca4 100644
--- a/usr.bin/tail/tail.1
+++ b/usr.bin/tail/tail.1
@@ -141,9 +141,7 @@ where
 .Dq XXX
 is the name of the file.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr cat 1 ,
 .Xr head 1 ,
diff --git a/usr.bin/tee/tee.1 b/usr.bin/tee/tee.1
index f56bd4e..4da4347 100644
--- a/usr.bin/tee/tee.1
+++ b/usr.bin/tee/tee.1
@@ -77,9 +77,7 @@ except in the event of the
 .Fl i
 option.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh STANDARDS
 The
 .Nm
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index b122428..73e537a 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -124,9 +124,7 @@ If the
 letter pair is not specified, the value defaults to 0.
 .El
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr utimes 2
 .Sh COMPATIBILITY
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index f46a95c..2875ccf 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -229,9 +229,7 @@ has a leading zero, it is interpreted as an octal value, otherwise,
 it's interpreted as a decimal value.
 .El
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh EXAMPLES
 The following examples are shown as given to the shell:
 .Pp
diff --git a/usr.bin/truncate/truncate.1 b/usr.bin/truncate/truncate.1
index 9f4747a..99bcc94 100644
--- a/usr.bin/truncate/truncate.1
+++ b/usr.bin/truncate/truncate.1
@@ -125,10 +125,7 @@ using (for example) the shell's
 redirection syntax, or
 .Xr dd 1 .
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success,
-and >0 if an error occurs.
+.Ex -std
 If the operation fails for an argument,
 .Nm
 will issue a diagnostic
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index 08f7508..5ac8966 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -82,10 +82,8 @@ If the
 .Fl a
 flag is specified, or multiple flags are specified, all
 output is written on a single line, separated by spaces.
-.Pp
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Sh DIAGNOSTICS
+.Ex -std
 .Sh SEE ALSO
 .Xr sysctl 3 ,
 .Xr uname 3 ,
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index f1db073..be6da61 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -115,9 +115,7 @@ If additional arguments are specified on the command line, the first
 argument is used as the name of an input file, the second is used
 as the name of an output file.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh COMPATIBILITY
 The historic
 .Cm \&\(pl Ns Ar number
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index f51c82f..fc535e2 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -84,9 +84,7 @@ The default action is equivalent to specifying all of the flags.
 If no files are specified, the standard input is used and no
 file name is displayed.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr isspace 3
 .Sh COMPATIBILITY
diff --git a/usr.sbin/ac/ac.8 b/usr.sbin/ac/ac.8
index 272c8eb..24c512f 100644
--- a/usr.sbin/ac/ac.8
+++ b/usr.sbin/ac/ac.8
@@ -117,10 +117,8 @@ allows times recorded in
 .Pa modems
 to be charged out at a different rate than
 .Pa other .
-.Pp
-The
-.Nm
-utility exits 0 on success, and >0 if a fatal error occurs.
+.Sh DIAGNOSTICS
+.Ex -std
 .Sh FILES
 .Bl -tag -width /var/log/wtmp.[0-7] -compact
 .It Pa /var/log/wtmp
diff --git a/usr.sbin/boot0cfg/boot0cfg.8 b/usr.sbin/boot0cfg/boot0cfg.8
index 834d4cc..b627382 100644
--- a/usr.sbin/boot0cfg/boot0cfg.8
+++ b/usr.sbin/boot0cfg/boot0cfg.8
@@ -153,7 +153,7 @@ image
 .Xr boot 8 ,
 .Xr fdisk 8
 .Sh DIAGNOSTICS
-Exit status is 0 on success and >0 on error.
+.Ex -std
 .Sh AUTHORS
 .An Robert Nordier Aq rnordier@FreeBSD.org .
 .Sh BUGS
diff --git a/usr.sbin/boot98cfg/boot98cfg.8 b/usr.sbin/boot98cfg/boot98cfg.8
index 4fae283..2f3b784 100644
--- a/usr.sbin/boot98cfg/boot98cfg.8
+++ b/usr.sbin/boot98cfg/boot98cfg.8
@@ -92,7 +92,7 @@ Specify the sector size.  The default secotor size is 512
 .Xr boot 8 ,
 .Xr fdisk 8
 .Sh DIAGNOSTICS
-Exit status is 0 on success and >0 on error.
+.Ex -std
 .Sh AUTHORS
 .An NOKUBI Hirotaka ,
 .An KATO Takenori
diff --git a/usr.sbin/btxld/btxld.8 b/usr.sbin/btxld/btxld.8
index 1ab188a..95dff0c 100644
--- a/usr.sbin/btxld/btxld.8
+++ b/usr.sbin/btxld/btxld.8
@@ -92,6 +92,6 @@ combined .text and .data segments of the client image.
 .Xr ld 1 ,
 .Xr boot 8
 .Sh DIAGNOSTICS
-Exit status is 0 on success and >0 on error.
+.Ex -std
 .Sh AUTHORS
 .An Robert Nordier Aq rnordier@FreeBSD.org .
diff --git a/usr.sbin/chown/chgrp.1 b/usr.sbin/chown/chgrp.1
index 7501de0..b52f7e5 100644
--- a/usr.sbin/chown/chgrp.1
+++ b/usr.sbin/chown/chgrp.1
@@ -113,9 +113,7 @@ The user invoking
 must belong to the specified group and be the owner of the file,
 or be the super-user.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh COMPATIBILITY
 In previous versions of this system, symbolic links did not have groups.
 .Pp
diff --git a/usr.sbin/chown/chown.8 b/usr.sbin/chown/chown.8
index c975b17..21794a2 100644
--- a/usr.sbin/chown/chown.8
+++ b/usr.sbin/chown/chown.8
@@ -123,10 +123,8 @@ group name.
 .Pp
 The ownership of a file may only be altered by a super-user for
 obvious security reasons.
-.Pp
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Sh DIAGNOSTICS
+.Ex -std
 .Sh COMPATIBILITY
 Previous versions of the
 .Nm
diff --git a/usr.sbin/kgzip/kgzip.8 b/usr.sbin/kgzip/kgzip.8
index dae14121..653a2ad 100644
--- a/usr.sbin/kgzip/kgzip.8
+++ b/usr.sbin/kgzip/kgzip.8
@@ -128,7 +128,7 @@ The default loader
 .Xr boot 8 ,
 .Xr loader 8
 .Sh DIAGNOSTICS
-Exit status is 0 on success and >0 on error.
+.Ex -std
 .Sh AUTHORS
 .An Robert Nordier Aq rnordier@FreeBSD.org .
 .Sh BUGS
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8
index 73a689a..9343308 100644
--- a/usr.sbin/mtree/mtree.8
+++ b/usr.sbin/mtree/mtree.8
@@ -324,9 +324,7 @@ distribution.
 system specification directory
 .El
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr chflags 1 ,
 .Xr chgrp 1 ,
diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8
index c62b7d8..666a863 100644
--- a/usr.sbin/nfsd/nfsd.8
+++ b/usr.sbin/nfsd/nfsd.8
@@ -168,10 +168,8 @@ If you have to kill
 .Nm
 just do a
 .Dq Li "kill -USR1 <PID of master nfsd>"
-.Pp
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Sh DIAGNOSTICS
+.Ex -std
 .Sh SEE ALSO
 .Xr nfsstat 1 ,
 .Xr nfssvc 2 ,
diff --git a/usr.sbin/ngctl/ngctl.8 b/usr.sbin/ngctl/ngctl.8
index 73198e0..5d4a8ee 100644
--- a/usr.sbin/ngctl/ngctl.8
+++ b/usr.sbin/ngctl/ngctl.8
@@ -122,9 +122,7 @@ The
 command displays the available
 commands, their usage and aliases, and a brief description.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr netgraph 3 ,
 .Xr netgraph 4 ,
diff --git a/usr.sbin/rtadvd/rtadvd.8 b/usr.sbin/rtadvd/rtadvd.8
index 5dc71cf..1d083896 100644
--- a/usr.sbin/rtadvd/rtadvd.8
+++ b/usr.sbin/rtadvd/rtadvd.8
@@ -145,10 +145,8 @@ In this case,
 will transmit router advertisement with router lifetime 0
 to all the interfaces
 (in accordance with RFC2461 6.2.5).
-.Sh RETURN VALUES
-The
-.Nm
-program exits 0 on success, and >0 on failures.
+.Sh DIAGNOSTICS
+.Ex -std
 .Sh FILES
 .Bl -tag -width Pa -compact
 .It Pa /etc/rtadvd.conf
diff --git a/usr.sbin/rtsold/rtsold.8 b/usr.sbin/rtsold/rtsold.8
index ed8247d..bd2fb24 100644
--- a/usr.sbin/rtsold/rtsold.8
+++ b/usr.sbin/rtsold/rtsold.8
@@ -175,10 +175,8 @@ Advertisement packet has arrived on each
 .Ar interface ,
 then exit.
 .El
-.Sh RETURN VALUES
-The
-.Nm
-program exits 0 on success, and >0 on failures.
+.Sh DIAGNOSTICS
+.Ex -std
 .\"
 .Sh FILES
 .Bl -tag -width /var/run/rtsold.dump -compact
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index 9e54a50..5eb22d7 100644
--- a/usr.sbin/sa/sa.8
+++ b/usr.sbin/sa/sa.8
@@ -193,10 +193,8 @@ flag is specified, only the
 and
 .Fl s
 flags are honored.
-.Pp
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Sh DIAGNOSTICS
+.Ex -std
 .Sh FILES
 .Bl -tag -width /var/account/usracct -compact
 .It Pa /var/account/acct