79 files changed, 83 insertions, 81 deletions

diff --git a/usr.bin/asa/asa.1 b/usr.bin/asa/asa.1
index c526b5e3d9b5..5f5c236a67e8 100644
--- a/usr.bin/asa/asa.1
+++ b/usr.bin/asa/asa.1
@@ -72,7 +72,7 @@ before printing the rest of the line.
 Lines beginning with characters other than the above are treated as if they
 begin with
 .Aq space .
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh EXAMPLES
 To view a file containing the output of a
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index 856a6d6d45ce..015ed3d8b0a5 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -99,7 +99,7 @@ to
 .Pa /usr/bin .
 .Pp
 .Dl FOO=`dirname /usr/bin/trail`
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std basename dirname
 .Sh SEE ALSO
 .Xr csh 1 ,
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index 11947705eeea..9f71fd6018fd 100644
--- a/usr.bin/biff/biff.1
+++ b/usr.bin/biff/biff.1
@@ -95,7 +95,7 @@ or the
 .Ev mail
 variable of
 .Xr csh 1 .
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 The
 .Nm
 utility exits with one of the following values:
diff --git a/usr.bin/bluetooth/bthost/bthost.1 b/usr.bin/bluetooth/bthost/bthost.1
index d475f924e9b5..e4a4abc45ecb 100644
--- a/usr.bin/bluetooth/bthost/bthost.1
+++ b/usr.bin/bluetooth/bthost/bthost.1
@@ -105,7 +105,7 @@ foo: Unknown Protocol/Service Multiplexor
 .It Pa /etc/bluetooth/hosts
 .It Pa /etc/bluetooth/protocols
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr bluetooth 3 ,
diff --git a/usr.bin/bluetooth/btsockstat/btsockstat.1 b/usr.bin/bluetooth/btsockstat/btsockstat.1
index b4127aeb470f..e82684d50818 100644
--- a/usr.bin/bluetooth/btsockstat/btsockstat.1
+++ b/usr.bin/bluetooth/btsockstat/btsockstat.1
@@ -75,7 +75,7 @@ Display a list of active routing entries (if any) for specified protocol.
 .Sh BUGS
 Most likely.
 Please report if found.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr ng_btsocket 4
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1 b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
index d4810ef846eb..06c133c76fe8 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
@@ -114,7 +114,7 @@ master pseudo terminals
 .It Pa /dev/tty[p-sP-S][0-9a-v]
 slave pseudo terminals
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh BUGS
 Please report if found.
diff --git a/usr.bin/brandelf/brandelf.1 b/usr.bin/brandelf/brandelf.1
index bc6b1772958b..4dfc90673163 100644
--- a/usr.bin/brandelf/brandelf.1
+++ b/usr.bin/brandelf/brandelf.1
@@ -82,7 +82,7 @@ command:
 .Pp
 .Dl % brandelf file
 .Dl % brandelf -t Linux file
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 Exit status is 0 on success, and 1 if the command
 fails if a file does not exist, is too short, fails to brand properly,
 or the brand requested is not one of the known types and the
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index 27c2a0c19ec2..0775997dd203 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.1
+++ b/usr.bin/cap_mkdb/cap_mkdb.1
@@ -90,7 +90,7 @@ in a key/data pair of the second type.
 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
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr dbopen 3 ,
diff --git a/usr.bin/catman/catman.1 b/usr.bin/catman/catman.1
index ea7e5e4498d7..8fc77803a772 100644
--- a/usr.bin/catman/catman.1
+++ b/usr.bin/catman/catman.1
@@ -91,7 +91,7 @@ Default directory to process if the
 .Ev MANPATH
 environment variable is not set.
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr makewhatis 1 ,
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index 27c4c0ba0de9..d4a0ee7d3ed2 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -155,7 +155,7 @@ The coefficients of R(x) are considered to be a 32-bit sequence.
 .Pp
 The bit sequence is complemented and the result is the CRC.
 .Ed
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std cksum sum
 .Sh SEE ALSO
 .Xr md5 1
diff --git a/usr.bin/col/col.1 b/usr.bin/col/col.1
index ded40233e70c..affb30604548 100644
--- a/usr.bin/col/col.1
+++ b/usr.bin/col/col.1
@@ -136,7 +136,7 @@ environment variables affect the execution of
 .Nm
 as described in
 .Xr environ 7 .
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr colcrt 1 ,
diff --git a/usr.bin/colcrt/colcrt.1 b/usr.bin/colcrt/colcrt.1
index 33c3e192129e..7c0292c8185f 100644
--- a/usr.bin/colcrt/colcrt.1
+++ b/usr.bin/colcrt/colcrt.1
@@ -86,7 +86,7 @@ would be
 .Bd -literal
 tbl exum2.n \&| nroff \-ms \&| colcrt \- \&| more
 .Ed
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr col 1 ,
diff --git a/usr.bin/colldef/colldef.1 b/usr.bin/colldef/colldef.1
index 6aa5b3efcea4..38bb090e33f3 100644
--- a/usr.bin/colldef/colldef.1
+++ b/usr.bin/colldef/colldef.1
@@ -250,7 +250,7 @@ The backslash character
 is used for continuation.
 In this case, no characters are permitted
 after the backslash character.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 The
 .Nm
 utility exits with the following values:
diff --git a/usr.bin/colrm/colrm.1 b/usr.bin/colrm/colrm.1
index 126c07d1399e..ceb04558e6dc 100644
--- a/usr.bin/colrm/colrm.1
+++ b/usr.bin/colrm/colrm.1
@@ -77,7 +77,7 @@ environment variables affect the execution of
 .Nm
 as described in
 .Xr environ 7 .
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr awk 1 ,
diff --git a/usr.bin/column/column.1 b/usr.bin/column/column.1
index a3c9ff15cbdc..b9a649ee3d39 100644
--- a/usr.bin/column/column.1
+++ b/usr.bin/column/column.1
@@ -74,7 +74,7 @@ Useful for pretty-printing displays.
 .It Fl x
 Fill columns before filling rows.
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh ENVIRONMENT
 The
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index fb1a11e7470c..ecc75722f2d2 100644
--- a/usr.bin/comm/comm.1
+++ b/usr.bin/comm/comm.1
@@ -95,7 +95,7 @@ environment variables affect the execution of
 .Nm
 as described in
 .Xr environ 7 .
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr cmp 1 ,
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index c74f17ac67e6..016078d42b09 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -152,7 +152,7 @@ Compression is generally much better than that achieved by Huffman
 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
+.Sh EXIT STATUS
 .Ex -std compress uncompress
 .Pp
 The
diff --git a/usr.bin/csplit/csplit.1 b/usr.bin/csplit/csplit.1
index e40981376e3f..0ce19a8c6c8c 100644
--- a/usr.bin/csplit/csplit.1
+++ b/usr.bin/csplit/csplit.1
@@ -136,7 +136,7 @@ into one file for each section (up to 20):
 Split standard input after the first 99 lines and every 100 lines thereafter:
 .Pp
 .Dl "csplit -k - 100 '{19}'"
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr sed 1 ,
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index 665a24ead667..d1f0d5a61632 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -196,7 +196,7 @@ file.
 .It Pa tags
 default output tags file
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 The
 .Nm
 utility exits with a value of 1 if an error occurred, 0 otherwise.
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index 2138d7681b8c..a4368e924728 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -146,7 +146,7 @@ pairs:
 Show the names and login times of the currently logged in users:
 .Pp
 .Dl "who | cut -c 1-16,26-38"
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr colrm 1 ,
diff --git a/usr.bin/elfdump/elfdump.1 b/usr.bin/elfdump/elfdump.1
index c159c7db7948..1708bd79bca9 100644
--- a/usr.bin/elfdump/elfdump.1
+++ b/usr.bin/elfdump/elfdump.1
@@ -81,7 +81,7 @@ of the
 command:
 .Pp
 .Dl "elfdump -a -w output /bin/ls"
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr objdump 1 ,
diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1
index 7e25eceef699..e6530e280cbe 100644
--- a/usr.bin/env/env.1
+++ b/usr.bin/env/env.1
@@ -109,7 +109,7 @@ environment variable to locate the requested
 if the name contains no
 .Ql /
 characters.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 An exit status of 126 indicates that
 .Ar utility
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index c6ffcd15d494..263017cc26d3 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -103,7 +103,7 @@ and
 .Nm unexpand
 as described in
 .Xr environ 7 .
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std expand unexpand
 .Sh STANDARDS
 The
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index 68ed094b587a..c25284bae2d3 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -209,7 +209,7 @@ argument for
 the current transfer rate statistics will be written to the
 standard error output, in the same format as the standard completion
 message.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 The
 .Nm
 command returns zero on success, or one on failure.
diff --git a/usr.bin/gencat/gencat.1 b/usr.bin/gencat/gencat.1
index 70c0e9c86795..eed676428487 100644
--- a/usr.bin/gencat/gencat.1
+++ b/usr.bin/gencat/gencat.1
@@ -169,7 +169,7 @@ 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.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr catclose 3 ,
diff --git a/usr.bin/getconf/getconf.1 b/usr.bin/getconf/getconf.1
index e0a9e869abe5..62758c15235b 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -145,8 +145,9 @@ Several of the
 .Xr confstr 3
 variables provide information on the necessary compiler and linker flags
 to use the standard programming environments described above.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
+.Sh DIAGNOSTICS
 Use of a
 .Ar system_var
 or
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index f0a42474d76b..7d34e4e6f3ad 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -88,7 +88,7 @@ cmd \-a \-oarg \-\- file file
 .Xr getopts 1 ,
 .Xr sh 1 ,
 .Xr getopt 3
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 The
 .Nm
 utility prints an error message on the standard error output and exits with
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index 262ad20cd193..81346182e650 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -59,7 +59,7 @@ header consisting of the string
 where
 .Dq XXX
 is the name of the file.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr tail 1
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index cddc910d0c5e..4d8c2daefecc 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -331,7 +331,7 @@ If no format strings are specified, the default display is equivalent
 to specifying the
 .Fl x
 option.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std hexdump hd
 .Sh EXAMPLES
 Display the input in perusal format:
diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
index 7bdad3a0a357..647fca030bd0 100644
--- a/usr.bin/hexdump/od.1
+++ b/usr.bin/hexdump/od.1
@@ -245,7 +245,7 @@ environment variables affect the execution of
 .Nm
 as described in
 .Xr environ 7 .
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh COMPATIBILITY
 The traditional
diff --git a/usr.bin/id/groups.1 b/usr.bin/id/groups.1
index 59174426d6db..0654f41f3fc9 100644
--- a/usr.bin/id/groups.1
+++ b/usr.bin/id/groups.1
@@ -56,7 +56,7 @@ The
 .Nm
 utility displays the groups to which you (or the optionally specified user)
 belong.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr id 1
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index cf53f44309f5..f0305f18f8ef 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -125,7 +125,7 @@ options instead of the effective ID.
 .It Fl u
 Display the effective user ID as a number.
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr who 1
diff --git a/usr.bin/id/whoami.1 b/usr.bin/id/whoami.1
index 4f7cb533291a..958570df5fcc 100644
--- a/usr.bin/id/whoami.1
+++ b/usr.bin/id/whoami.1
@@ -54,7 +54,7 @@ is suggested for normal interactive use.
 The
 .Nm
 utility displays your effective user ID as a name.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr id 1
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index aa6f73903a9c..c5323bf800af 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -166,7 +166,7 @@ or
 is
 .Dq - ,
 the standard input is used.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh COMPATIBILITY
 For compatibility with historic versions of
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index 09f64296e62a..7642f478b982 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -186,8 +186,9 @@ from column 10 and ending in column 132, use
 .Pp
 and to print all lines 80 characters or longer,
 .Dl grep `jot -s \&"\&" -b \&. 80`
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
+.Sh DIAGNOSTICS
 The following diagnostic messages deserve special explanation:
 .Bl -diag
 .It "illegal or unsupported format '%s'"
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index 9580d05c0971..bfac13f7e7e1 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -124,7 +124,7 @@ So use
 .Xr kill 1
 for this job (e.g.\& $ kill -TERM -1 or
 as root $ echo kill -TERM -1 | su -m <user>)
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 The
 .Nm
 command will respond with a short usage message and exit with a status
@@ -134,7 +134,7 @@ either no matching process has been found or not all processes have
 been signalled successfully.
 Otherwise, a status of 0 will be
 returned.
-.Pp
+.Sh DIAGNOSTICS
 Diagnostic messages will only be printed if requested by
 .Fl d
 options.
diff --git a/usr.bin/limits/limits.1 b/usr.bin/limits/limits.1
index 75efca3dff2c..62efb85fe57a 100644
--- a/usr.bin/limits/limits.1
+++ b/usr.bin/limits/limits.1
@@ -340,7 +340,7 @@ When invoked to execute a program, the failure of
 .Nm
 to raise a hard limit is considered a fatal error.
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 The
 .Nm
 utility
diff --git a/usr.bin/locale/locale.1 b/usr.bin/locale/locale.1
index 52d997426a12..058c06d2f0cf 100644
--- a/usr.bin/locale/locale.1
+++ b/usr.bin/locale/locale.1
@@ -79,7 +79,7 @@ The special
 specific) keyword
 .Cm list
 can be used to retrieve the human readable list of all available keywords.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh BUGS
 Since
diff --git a/usr.bin/lockf/lockf.1 b/usr.bin/lockf/lockf.1
index 1b9b6ea8b284..01270cd04726 100644
--- a/usr.bin/lockf/lockf.1
+++ b/usr.bin/lockf/lockf.1
@@ -91,7 +91,7 @@ will fail unless it can acquire the lock immediately.
 In no event will
 .Nm
 break a lock that is held by another process.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 If
 .Nm
 successfully acquires the lock, it returns the exit status produced by
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index c5c7dff19763..cc952ea11b21 100644
--- a/usr.bin/logger/logger.1
+++ b/usr.bin/logger/logger.1
@@ -101,7 +101,7 @@ Write the message to log; if not specified, and the
 flag is not
 provided, standard input is logged.
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh EXAMPLES
 .Bd -literal -offset indent -compact
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index 2f187e99e46f..99ebee510b33 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -57,7 +57,7 @@ and
 .Ev USER
 environment variables
 because the environment cannot be trusted.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr who 1 ,
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index 7a9980e59753..ecc19a62cd24 100644
--- a/usr.bin/look/look.1
+++ b/usr.bin/look/look.1
@@ -95,7 +95,7 @@ Their effect is described in
 .It Pa /usr/share/dict/words
 the dictionary
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 The
 .Nm
 utility exits 0 if one or more lines were found and displayed,
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 91fd9da26706..0c492a98ca3c 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -350,7 +350,7 @@ Returns the current file's line number.
 .It Ic __file__
 Returns the current file's name.
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Pp
 The
diff --git a/usr.bin/makewhatis/makewhatis.1 b/usr.bin/makewhatis/makewhatis.1
index 9e2921f9be97..4e20cebf8d93 100644
--- a/usr.bin/makewhatis/makewhatis.1
+++ b/usr.bin/makewhatis/makewhatis.1
@@ -111,7 +111,7 @@ environment variable is not set.
 .It Pa */man/whatis
 The default output file.
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr apropos 1 ,
diff --git a/usr.bin/mesg/mesg.1 b/usr.bin/mesg/mesg.1
index d62b6bb10232..87e800739c41 100644
--- a/usr.bin/mesg/mesg.1
+++ b/usr.bin/mesg/mesg.1
@@ -76,7 +76,7 @@ Allow messages from other users to
 (assuming you are also logged in on that terminal):
 .Pp
 .Dl "mesg y </dev/ttyp1"
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 The
 .Nm
 utility exits with one of the following values:
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index 6d7a33731ae5..a39251a39e67 100644
--- a/usr.bin/mkfifo/mkfifo.1
+++ b/usr.bin/mkfifo/mkfifo.1
@@ -79,7 +79,7 @@ of the calling process.
 The
 .Nm
 utility requires write permission in the parent directory.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh STANDARDS
 The
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
index 354331de8b65..e923f9be0936 100644
--- a/usr.bin/mktemp/mktemp.1
+++ b/usr.bin/mktemp/mktemp.1
@@ -153,7 +153,7 @@ but still introduces a race condition.
 Use of this
 option is not encouraged.
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 The
 .Nm
 utility
diff --git a/usr.bin/mkuzip/mkuzip.8 b/usr.bin/mkuzip/mkuzip.8
index aa0fcfc294fd..adce3d5d56b0 100644
--- a/usr.bin/mkuzip/mkuzip.8
+++ b/usr.bin/mkuzip/mkuzip.8
@@ -97,7 +97,7 @@ utility to the mount point provided as a first argument.
 .Xr md 4 ,
 .Xr mdconfig 8 ,
 .Xr mount_cd9660 8
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh AUTHORS
 .An Maxim Sobolev Aq sobomax@FreeBSD.org
diff --git a/usr.bin/newgrp/newgrp.1 b/usr.bin/newgrp/newgrp.1
index 1b3564c58dfc..44ab9fd56583 100644
--- a/usr.bin/newgrp/newgrp.1
+++ b/usr.bin/newgrp/newgrp.1
@@ -57,7 +57,7 @@ specified group.
 .Pp
 Otherwise, the real, effective and supplementary group IDs are restored to
 those from the current user's password database entry.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 The
 .Nm
 utility attempts to start the shell regardless of whether group IDs
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index b55a9fc938ec..ff4eed21efd2 100644
--- a/usr.bin/nice/nice.1
+++ b/usr.bin/nice/nice.1
@@ -86,7 +86,7 @@ at priority -19 assuming the priority of the
 shell is 0 and you are the super-user:
 .Pp
 .Dl "nice -n 16 nice -n -35 date"
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 If
 .Ar utility
 is invoked, the exit status of
diff --git a/usr.bin/nl/nl.1 b/usr.bin/nl/nl.1
index 8ea7705ea5ef..f3d9c03080c0 100644
--- a/usr.bin/nl/nl.1
+++ b/usr.bin/nl/nl.1
@@ -232,7 +232,7 @@ environment variables affect the execution of
 .Nm
 as described in
 .Xr environ 7 .
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr jot 1 ,
diff --git a/usr.bin/nohup/nohup.1 b/usr.bin/nohup/nohup.1
index 63f0751b4568..bf74dd65bf39 100644
--- a/usr.bin/nohup/nohup.1
+++ b/usr.bin/nohup/nohup.1
@@ -88,7 +88,7 @@ if the name contains no
 .Ql /
 characters.
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 The
 .Nm
 utility exits with one of the following values:
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index c9a8f845a337..f906fa435add 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -132,7 +132,7 @@ for use in the
 environment variable:
 .Pp
 .Dl "find / -name bin -type d | paste -s -d : -"
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr cut 1 ,
diff --git a/usr.bin/pathchk/pathchk.1 b/usr.bin/pathchk/pathchk.1
index d9476526db77..70c3eb1957ab 100644
--- a/usr.bin/pathchk/pathchk.1
+++ b/usr.bin/pathchk/pathchk.1
@@ -103,7 +103,7 @@ other
 systems:
 .Pp
 .Dl "find . -print | xargs pathchk -p"
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr getconf 1 ,
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index 2634cf0c5890..eb74a1c137d4 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -366,11 +366,11 @@ If
 receives an interrupt while printing to a terminal, it
 flushes all accumulated error messages to the screen before
 terminating.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 The
 .Nm
 utility exits 0 on success, and 1 if an error occurs.
-.Pp
+.Sh DIAGNOSTICS
 Error messages are written to standard error during the printing
 process (if output is redirected) or after all successful
 file printing is complete (when printing to a terminal).
diff --git a/usr.bin/printenv/printenv.1 b/usr.bin/printenv/printenv.1
index 7c058780c6ad..c30d81cd948f 100644
--- a/usr.bin/printenv/printenv.1
+++ b/usr.bin/printenv/printenv.1
@@ -59,7 +59,7 @@ command which is similar or identical to this utility.
 Consult the
 .Xr builtin 1
 manual page.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std printenv
 .Sh SEE ALSO
 .Xr csh 1 ,
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index f1a2eebaf222..445c7aaf4ecd 100644
--- a/usr.bin/printf/printf.1
+++ b/usr.bin/printf/printf.1
@@ -295,7 +295,7 @@ character is defined in the program's locale (category
 In no case does a non-existent or small field width cause truncation of
 a field; padding takes place only if the specified field width exceeds
 the actual width.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh COMPATIBILITY
 The traditional
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 5a22b9fd405f..ca170ee17ae2 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -515,7 +515,7 @@ environment variables affect the execution of
 .Nm
 as described in
 .Xr environ 7 .
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr awk 1 ,
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index cbeee6f4a3ec..70ed146cc5a1 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -123,7 +123,7 @@ environment variables affect the execution of
 .Nm
 as described in
 .Xr environ 7 .
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr csplit 1 ,
diff --git a/usr.bin/tabs/tabs.1 b/usr.bin/tabs/tabs.1
index c0c4f4d2736a..9075de5fa7ff 100644
--- a/usr.bin/tabs/tabs.1
+++ b/usr.bin/tabs/tabs.1
@@ -133,7 +133,7 @@ nor the
 option are present,
 .Nm
 will fail.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr expand 1 ,
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index 0791e74334ba..9b8cabe8534e 100644
--- a/usr.bin/tail/tail.1
+++ b/usr.bin/tail/tail.1
@@ -140,7 +140,7 @@ header consisting of the string
 where
 .Dq XXX
 is the name of the file.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr cat 1 ,
diff --git a/usr.bin/tar/bsdtar.1 b/usr.bin/tar/bsdtar.1
index 98b916266f3e..2c96114fb6d0 100644
--- a/usr.bin/tar/bsdtar.1
+++ b/usr.bin/tar/bsdtar.1
@@ -389,7 +389,7 @@ Finally, it will switch to the
 directory and add
 .Pa foo2
 to the output archive.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
diff --git a/usr.bin/tee/tee.1 b/usr.bin/tee/tee.1
index 4da4347d1775..0f492c0981af 100644
--- a/usr.bin/tee/tee.1
+++ b/usr.bin/tee/tee.1
@@ -76,7 +76,7 @@ utility takes the default action for all signals,
 except in the event of the
 .Fl i
 option.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh STANDARDS
 The
diff --git a/usr.bin/time/time.1 b/usr.bin/time/time.1
index 0aea7045067c..199b2a85e84b 100644
--- a/usr.bin/time/time.1
+++ b/usr.bin/time/time.1
@@ -107,7 +107,7 @@ environment variable is used to locate the requested
 if the name contains no
 .Ql /
 characters.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 If
 .Ar utility
 could be timed successfully, its exit status is returned.
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index 5612e54c3b04..7bc74b8e4584 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -131,7 +131,7 @@ If the
 .Dq SS
 letter pair is not specified, the value defaults to 0.
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr utimes 2
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index 6e5f41e4ab3a..d29e27625cef 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -110,7 +110,7 @@ Reset the terminal (the
 .Dq rs
 sequence).
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 The exit status of
 .Nm
 is as follows:
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index 1c81615d1813..d56255edb04f 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -305,7 +305,7 @@ Remove diacritical marks from all accented variants of the letter
 .Ql e :
 .Pp
 .Dl "tr \*q[=e=]\*q \*qe\*q"
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh COMPATIBILITY
 Previous
diff --git a/usr.bin/truncate/truncate.1 b/usr.bin/truncate/truncate.1
index 9449939ec67d..c79e64a92a70 100644
--- a/usr.bin/truncate/truncate.1
+++ b/usr.bin/truncate/truncate.1
@@ -125,7 +125,7 @@ using (for example) the shell's
 .Ql >>
 redirection syntax, or
 .Xr dd 1 .
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 If the operation fails for an argument,
 .Nm
diff --git a/usr.bin/uac/uac.1 b/usr.bin/uac/uac.1
index 4256417676f9..987cdff81f75 100644
--- a/usr.bin/uac/uac.1
+++ b/usr.bin/uac/uac.1
@@ -79,7 +79,7 @@ Unaligned access errors result in a
 being delivered to the parent and its future descendants.
 This aids in pinpointing the faulting access so it can be debugged.
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 Exit status is 0 on success, and 1 if the command
 fails for any reason.
 .Sh COMPATIBILITY
diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1
index 771c3dad983a..5d41d253e43a 100644
--- a/usr.bin/ul/ul.1
+++ b/usr.bin/ul/ul.1
@@ -84,7 +84,7 @@ environment variables affect the execution of
 .Nm
 as described in
 .Xr environ 7 .
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr colcrt 1 ,
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index b9b93ffea9e1..23ce8d0ada1a 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -79,7 +79,7 @@ If the
 .Fl a
 flag is specified, or multiple flags are specified, all
 output is written on a single line, separated by spaces.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh ENVIRONMENT
 An environment variable composed of the string
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index ff703707bb91..e129c5486c38 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -294,7 +294,7 @@ Premature
 .Tn EOF
 in comment.
 .El
-.Pp
+.Sh EXIT STATUS
 The
 .Nm
 utility exits 0 if the output is an exact copy of the input,
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index 4654104fd5fa..79be0a40a5dd 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -132,7 +132,7 @@ environment variables affect the execution of
 .Nm
 as described in
 .Xr environ 7 .
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh COMPATIBILITY
 The historic
diff --git a/usr.bin/uuidgen/uuidgen.1 b/usr.bin/uuidgen/uuidgen.1
index 5e974755e0c5..e685369e5b5c 100644
--- a/usr.bin/uuidgen/uuidgen.1
+++ b/usr.bin/uuidgen/uuidgen.1
@@ -67,7 +67,7 @@ set.
 When generating the identifiers one at a time, the identifiers will be close
 to each other, but operating system latency and processing time will be
 reflected in the distance between two successive identifiers.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr uuidgen 2 ,
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index e9369d5b5596..d8ef9353f9ad 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -110,7 +110,7 @@ and
 as well as the totals for both:
 .Pp
 .Dl "wc -mlw report1 report2"
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr iswspace 3
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index 027debf94e9b..59cb2815cf66 100644
--- a/usr.bin/what/what.1
+++ b/usr.bin/what/what.1
@@ -62,7 +62,7 @@ The following option is available:
 .It Fl s
 Stop searching each file after the first match.
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 Exit status is 0 if any matches were found, otherwise 1.
 .Sh SEE ALSO
 .Xr ident 1 ,
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index ceb4f2ce1f6f..e36b07cde550 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -135,7 +135,7 @@ as described in
 .It Pa /var/log/wtmp
 .It Pa /var/log/wtmp.[0-6]
 .El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
 .Xr last 1 ,
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index 57f2c031d443..609db3ff5f75 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -267,7 +267,7 @@ is terminated by a signal,
 or an invocation of
 .Ar utility
 exits with a value of 255.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 The
 .Nm
 utility exits with a value of 0 if no error occurs.
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index e8033d0ffc97..2a865791f270 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -180,7 +180,7 @@ utility attempts to prevent moving a file onto itself.
 Installing
 .Pa /dev/null
 creates an empty file.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 .Ex -std
 .Sh ENVIRONMENT
 The