aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2005-01-17 07:44:44 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2005-01-17 07:44:44 +0000
commita866e170777b42fd7921eadd6e7e664f3a031d60 (patch)
treef5a5fbfda9358c31fa2746d0671fe366bb17d243
parente8cde1ac6ff037d232538a4e35b007b4ece89a9a (diff)
downloadsrc-a866e170777b42fd7921eadd6e7e664f3a031d60.tar.gz
src-a866e170777b42fd7921eadd6e7e664f3a031d60.zip
Added the EXIT STATUS section where appropriate.
Notes
Notes: svn path=/head/; revision=140368
-rw-r--r--bin/uuidgen/uuidgen.12
-rw-r--r--gnu/usr.bin/man/apropos/apropos.man2
-rw-r--r--sbin/dump/dump.82
-rw-r--r--sbin/fsck_ffs/fsck_ffs.84
-rw-r--r--sbin/geom/class/concat/gconcat.82
-rw-r--r--sbin/geom/class/label/glabel.82
-rw-r--r--sbin/geom/class/mirror/gmirror.82
-rw-r--r--sbin/geom/class/nop/gnop.82
-rw-r--r--sbin/geom/class/raid3/graid3.82
-rw-r--r--sbin/geom/class/shsec/gshsec.82
-rw-r--r--sbin/geom/class/stripe/gstripe.82
-rw-r--r--sbin/geom/core/geom.82
-rw-r--r--sbin/ggate/ggatec/ggatec.82
-rw-r--r--sbin/ggate/ggated/ggated.82
-rw-r--r--sbin/ggate/ggatel/ggatel.82
-rw-r--r--sbin/kldconfig/kldconfig.87
-rw-r--r--sbin/kldload/kldload.82
-rw-r--r--sbin/kldstat/kldstat.87
-rw-r--r--sbin/kldunload/kldunload.87
-rw-r--r--sbin/md5/md5.12
-rw-r--r--sbin/newfs_msdos/newfs_msdos.82
-rw-r--r--sbin/nfsiod/nfsiod.82
-rw-r--r--sbin/ping6/ping6.82
-rw-r--r--sbin/route/route.82
-rw-r--r--sbin/setkey/setkey.82
-rw-r--r--usr.bin/asa/asa.12
-rw-r--r--usr.bin/basename/basename.12
-rw-r--r--usr.bin/biff/biff.12
-rw-r--r--usr.bin/bluetooth/bthost/bthost.12
-rw-r--r--usr.bin/bluetooth/btsockstat/btsockstat.12
-rw-r--r--usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.12
-rw-r--r--usr.bin/brandelf/brandelf.12
-rw-r--r--usr.bin/cap_mkdb/cap_mkdb.12
-rw-r--r--usr.bin/catman/catman.12
-rw-r--r--usr.bin/cksum/cksum.12
-rw-r--r--usr.bin/col/col.12
-rw-r--r--usr.bin/colcrt/colcrt.12
-rw-r--r--usr.bin/colldef/colldef.12
-rw-r--r--usr.bin/colrm/colrm.12
-rw-r--r--usr.bin/column/column.12
-rw-r--r--usr.bin/comm/comm.12
-rw-r--r--usr.bin/compress/compress.12
-rw-r--r--usr.bin/csplit/csplit.12
-rw-r--r--usr.bin/ctags/ctags.12
-rw-r--r--usr.bin/cut/cut.12
-rw-r--r--usr.bin/elfdump/elfdump.12
-rw-r--r--usr.bin/env/env.12
-rw-r--r--usr.bin/expand/expand.12
-rw-r--r--usr.bin/fetch/fetch.12
-rw-r--r--usr.bin/gencat/gencat.12
-rw-r--r--usr.bin/getconf/getconf.13
-rw-r--r--usr.bin/getopt/getopt.12
-rw-r--r--usr.bin/head/head.12
-rw-r--r--usr.bin/hexdump/hexdump.12
-rw-r--r--usr.bin/hexdump/od.12
-rw-r--r--usr.bin/id/groups.12
-rw-r--r--usr.bin/id/id.12
-rw-r--r--usr.bin/id/whoami.12
-rw-r--r--usr.bin/join/join.12
-rw-r--r--usr.bin/jot/jot.13
-rw-r--r--usr.bin/killall/killall.14
-rw-r--r--usr.bin/limits/limits.12
-rw-r--r--usr.bin/locale/locale.12
-rw-r--r--usr.bin/lockf/lockf.12
-rw-r--r--usr.bin/logger/logger.12
-rw-r--r--usr.bin/logname/logname.12
-rw-r--r--usr.bin/look/look.12
-rw-r--r--usr.bin/m4/m4.12
-rw-r--r--usr.bin/makewhatis/makewhatis.12
-rw-r--r--usr.bin/mesg/mesg.12
-rw-r--r--usr.bin/mkfifo/mkfifo.12
-rw-r--r--usr.bin/mktemp/mktemp.12
-rw-r--r--usr.bin/mkuzip/mkuzip.82
-rw-r--r--usr.bin/newgrp/newgrp.12
-rw-r--r--usr.bin/nice/nice.12
-rw-r--r--usr.bin/nl/nl.12
-rw-r--r--usr.bin/nohup/nohup.12
-rw-r--r--usr.bin/paste/paste.12
-rw-r--r--usr.bin/pathchk/pathchk.12
-rw-r--r--usr.bin/pr/pr.14
-rw-r--r--usr.bin/printenv/printenv.12
-rw-r--r--usr.bin/printf/printf.12
-rw-r--r--usr.bin/sed/sed.12
-rw-r--r--usr.bin/split/split.12
-rw-r--r--usr.bin/tabs/tabs.12
-rw-r--r--usr.bin/tail/tail.12
-rw-r--r--usr.bin/tar/bsdtar.12
-rw-r--r--usr.bin/tee/tee.12
-rw-r--r--usr.bin/time/time.12
-rw-r--r--usr.bin/touch/touch.12
-rw-r--r--usr.bin/tput/tput.12
-rw-r--r--usr.bin/tr/tr.12
-rw-r--r--usr.bin/truncate/truncate.12
-rw-r--r--usr.bin/uac/uac.12
-rw-r--r--usr.bin/ul/ul.12
-rw-r--r--usr.bin/uname/uname.12
-rw-r--r--usr.bin/unifdef/unifdef.12
-rw-r--r--usr.bin/uniq/uniq.12
-rw-r--r--usr.bin/uuidgen/uuidgen.12
-rw-r--r--usr.bin/wc/wc.12
-rw-r--r--usr.bin/what/what.12
-rw-r--r--usr.bin/who/who.12
-rw-r--r--usr.bin/xargs/xargs.12
-rw-r--r--usr.bin/xinstall/install.12
-rw-r--r--usr.sbin/ac/ac.82
-rw-r--r--usr.sbin/bluetooth/bcmfw/bcmfw.82
-rw-r--r--usr.sbin/bluetooth/bt3cfw/bt3cfw.82
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/bthidcontrol.82
-rw-r--r--usr.sbin/bluetooth/hccontrol/hccontrol.82
-rw-r--r--usr.sbin/bluetooth/l2control/l2control.82
-rw-r--r--usr.sbin/bluetooth/l2ping/l2ping.82
-rw-r--r--usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.82
-rw-r--r--usr.sbin/bluetooth/sdpcontrol/sdpcontrol.82
-rw-r--r--usr.sbin/boot0cfg/boot0cfg.82
-rw-r--r--usr.sbin/boot98cfg/boot98cfg.82
-rw-r--r--usr.sbin/btxld/btxld.82
-rw-r--r--usr.sbin/chkgrp/chkgrp.82
-rw-r--r--usr.sbin/chown/chgrp.12
-rw-r--r--usr.sbin/chown/chown.82
-rw-r--r--usr.sbin/ckdist/ckdist.12
-rw-r--r--usr.sbin/ctm/ctm_rmail/ctm_rmail.14
-rw-r--r--usr.sbin/daemon/daemon.83
-rw-r--r--usr.sbin/faithd/faithd.82
-rw-r--r--usr.sbin/fdread/fdread.14
-rw-r--r--usr.sbin/flowctl/flowctl.82
-rw-r--r--usr.sbin/gstat/gstat.82
-rw-r--r--usr.sbin/i4b/isdnd/isdnd.82
-rw-r--r--usr.sbin/i4b/isdnmonitor/isdnmonitor.82
-rw-r--r--usr.sbin/ip6addrctl/ip6addrctl.82
-rw-r--r--usr.sbin/kgzip/kgzip.82
-rw-r--r--usr.sbin/mergemaster/mergemaster.82
-rw-r--r--usr.sbin/mtree/mtree.82
-rw-r--r--usr.sbin/ndp/ndp.82
-rw-r--r--usr.sbin/nfsd/nfsd.82
-rw-r--r--usr.sbin/ngctl/ngctl.82
-rw-r--r--usr.sbin/pcvt/ispcvt/ispcvt.82
-rw-r--r--usr.sbin/periodic/periodic.85
-rw-r--r--usr.sbin/pkg_install/sign/pkg_sign.13
-rw-r--r--usr.sbin/pw/pw.82
-rw-r--r--usr.sbin/rtprio/rtprio.12
-rw-r--r--usr.sbin/sa/sa.82
-rw-r--r--usr.sbin/setkey/setkey.82
-rw-r--r--usr.sbin/smbmsg/smbmsg.83
143 files changed, 158 insertions, 161 deletions
diff --git a/bin/uuidgen/uuidgen.1 b/bin/uuidgen/uuidgen.1
index 5e974755e0c5..e685369e5b5c 100644
--- a/bin/uuidgen/uuidgen.1
+++ b/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/gnu/usr.bin/man/apropos/apropos.man b/gnu/usr.bin/man/apropos/apropos.man
index 8d9fd50bcd21..c707113606df 100644
--- a/gnu/usr.bin/man/apropos/apropos.man
+++ b/gnu/usr.bin/man/apropos/apropos.man
@@ -37,7 +37,7 @@ displays only complete word matches.
really is an extended regular expression, please read
.Xr grep 1
manual page for more information about its format.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
The
.Nm
utility exits 0 on success, and 1 if no keyword matched.
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index ea35653374ae..b7be5efc8d1e 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -471,7 +471,7 @@ to find group
.Xr rmt 8
.Sh DIAGNOSTICS
Many, and verbose.
-.Pp
+.Sh EXIT STATUS
Dump exits with zero status on success.
Startup errors are indicated with an exit code of 1;
abnormal termination is indicated with an exit code of 3.
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index 4bfa11cb45e6..26c47bfde0e0 100644
--- a/sbin/fsck_ffs/fsck_ffs.8
+++ b/sbin/fsck_ffs/fsck_ffs.8
@@ -299,9 +299,9 @@ If there is insufficient space its size is increased.
.It Pa /etc/fstab
contains default list of file systems to check.
.El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
-.Pp
+.Sh DIAGNOSTICS
The diagnostics produced by
.Nm
are fully enumerated and explained in Appendix A of
diff --git a/sbin/geom/class/concat/gconcat.8 b/sbin/geom/class/concat/gconcat.8
index 6532e2669cc7..4e729a2fca57 100644
--- a/sbin/geom/class/concat/gconcat.8
+++ b/sbin/geom/class/concat/gconcat.8
@@ -165,7 +165,7 @@ umount /mnt
gconcat stop data
gconcat unload
.Ed
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 on success, and 1 if the command fails.
.Sh SEE ALSO
.Xr geom 4 ,
diff --git a/sbin/geom/class/label/glabel.8 b/sbin/geom/class/label/glabel.8
index 0b103448c72a..0fb4d95e33de 100644
--- a/sbin/geom/class/label/glabel.8
+++ b/sbin/geom/class/label/glabel.8
@@ -197,7 +197,7 @@ The next example shows how to set up a label for a UFS file system:
tunefs -L data /dev/da4s1a
mount /dev/ufs/data /mnt/data
.Ed
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 on success, and 1 if the command fails.
.Sh SEE ALSO
.Xr geom 4 ,
diff --git a/sbin/geom/class/mirror/gmirror.8 b/sbin/geom/class/mirror/gmirror.8
index 33212bfa2e7d..350df8e1a02c 100644
--- a/sbin/geom/class/mirror/gmirror.8
+++ b/sbin/geom/class/mirror/gmirror.8
@@ -268,7 +268,7 @@ gmirror deactivate data da1
dd if=/dev/da1 of=/backup/data.img bs=1m
gmirror activate data da1
.Ed
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 on success, and 1 if the command fails.
.Sh SEE ALSO
.Xr geom 4 ,
diff --git a/sbin/geom/class/nop/gnop.8 b/sbin/geom/class/nop/gnop.8
index 99b15d474d12..dfa209c4c9c9 100644
--- a/sbin/geom/class/nop/gnop.8
+++ b/sbin/geom/class/nop/gnop.8
@@ -136,7 +136,7 @@ with 50% failure probability, and how to destroy it.
gnop create -v -f 50 da0
gnop destroy -v da0.nop
.Ed
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 on success, and 1 if the command fails.
.Sh SEE ALSO
.Xr geom 4 ,
diff --git a/sbin/geom/class/raid3/graid3.8 b/sbin/geom/class/raid3/graid3.8
index c0b0dd4e37c6..16669fe16c58 100644
--- a/sbin/geom/class/raid3/graid3.8
+++ b/sbin/geom/class/raid3/graid3.8
@@ -217,7 +217,7 @@ Replace one data disk with a brand new one:
graid3 remove -n 0 data
graid3 insert -n 0 data da5
.Ed
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 on success, and 1 if the command fails.
.Sh SEE ALSO
.Xr geom 4 ,
diff --git a/sbin/geom/class/shsec/gshsec.8 b/sbin/geom/class/shsec/gshsec.8
index 092e6e8db9ba..14e8a46400c2 100644
--- a/sbin/geom/class/shsec/gshsec.8
+++ b/sbin/geom/class/shsec/gshsec.8
@@ -113,7 +113,7 @@ From now on, when USB Pen drive will be inserted, it will be automatically
detected and connected making secret available via
.Pa /dev/shsec/secret
device.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 on success, and 1 if the command fails.
.Sh SEE ALSO
.Xr geom 4 ,
diff --git a/sbin/geom/class/stripe/gstripe.8 b/sbin/geom/class/stripe/gstripe.8
index 107e8ccad7af..9e6b720c39ea 100644
--- a/sbin/geom/class/stripe/gstripe.8
+++ b/sbin/geom/class/stripe/gstripe.8
@@ -204,7 +204,7 @@ umount /mnt
gstripe stop data
gstripe unload
.Ed
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 on success, and 1 if the command fails.
.Sh COMPATIBILITY
The
diff --git a/sbin/geom/core/geom.8 b/sbin/geom/core/geom.8
index f6fda365e7df..2ac8d41374a7 100644
--- a/sbin/geom/core/geom.8
+++ b/sbin/geom/core/geom.8
@@ -112,7 +112,7 @@ Unload a kernel module which implements the MD class:
.Bd -literal -offset indent
geom md unload
.Ed
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 on success, and 1 if the command fails.
.Sh SEE ALSO
.Xr geom 4 ,
diff --git a/sbin/ggate/ggatec/ggatec.8 b/sbin/ggate/ggatec/ggatec.8
index 22038e8b0ad2..52c2cd5e1c41 100644
--- a/sbin/ggate/ggatec/ggatec.8
+++ b/sbin/ggate/ggatec/ggatec.8
@@ -161,7 +161,7 @@ client# ggatec create -o ro server /dev/acd0
ggate0
client# mount_cd9660 /dev/ggate0 /cdrom
.Ed
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 on success, or 1 if the command fails.
To get details about the failure,
.Nm
diff --git a/sbin/ggate/ggated/ggated.8 b/sbin/ggate/ggated/ggated.8
index 0b774ad65507..c1fd97633134 100644
--- a/sbin/ggate/ggated/ggated.8
+++ b/sbin/ggate/ggated/ggated.8
@@ -93,7 +93,7 @@ Export CD-ROM device and a file:
# echo "client RW /image" >> /etc/gg.exports
# ggated
.Ed
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 on success, or 1 if the command fails.
To get details about the failure,
.Nm
diff --git a/sbin/ggate/ggatel/ggatel.8 b/sbin/ggate/ggatel/ggatel.8
index f08edeefcc47..b28abbb2e89b 100644
--- a/sbin/ggate/ggatel/ggatel.8
+++ b/sbin/ggate/ggatel/ggatel.8
@@ -139,7 +139,7 @@ umount /secret
gbde detach ggate5
ggatel destroy -u 5
.Ed
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 on success, or 1 if the command fails.
To get details about the failure,
.Nm
diff --git a/sbin/kldconfig/kldconfig.8 b/sbin/kldconfig/kldconfig.8
index 65766ec33ae2..191f4add9e52 100644
--- a/sbin/kldconfig/kldconfig.8
+++ b/sbin/kldconfig/kldconfig.8
@@ -93,11 +93,8 @@ flag is specified more than once, the old path is displayed as well.
.It Pa /boot/kernel , /boot/modules , /modules
The default module search path used by the kernel.
.El
-.Sh DIAGNOSTICS
-The
-.Nm
-utility exits with a status of 0 on success
-and with a nonzero status if an error occurs.
+.Sh EXIT STATUS
+.Ex -std
.Sh SEE ALSO
.Xr kldload 2 ,
.Xr kldload 8 ,
diff --git a/sbin/kldload/kldload.8 b/sbin/kldload/kldload.8
index dd28d38454ba..b58207ee54ea 100644
--- a/sbin/kldload/kldload.8
+++ b/sbin/kldload/kldload.8
@@ -56,7 +56,7 @@ directory containing loadable modules.
Modules must have an extension of
.Pa .ko .
.El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh AUTOMATICALLY LOADING MODULES
Some modules (ipfw, ipf, etc.) may be automatically loaded at boot
diff --git a/sbin/kldstat/kldstat.8 b/sbin/kldstat/kldstat.8
index bbabb73ee3ae..77d933d7e924 100644
--- a/sbin/kldstat/kldstat.8
+++ b/sbin/kldstat/kldstat.8
@@ -51,11 +51,8 @@ Display the status of only the file with this ID.
.It Fl n Ar name
Display the status of only the file with this name.
.El
-.Sh DIAGNOSTICS
-The
-.Nm
-utility exits with a status of 0 on success
-and with a nonzero status if an error occurs.
+.Sh EXIT STATUS
+.Ex -std
.Sh SEE ALSO
.Xr kldstat 2 ,
.Xr kldload 8 ,
diff --git a/sbin/kldunload/kldunload.8 b/sbin/kldunload/kldunload.8
index 4246f0b50b80..7bd7303c54dc 100644
--- a/sbin/kldunload/kldunload.8
+++ b/sbin/kldunload/kldunload.8
@@ -61,11 +61,8 @@ Unload the file with this name.
.It Ar name
Unload the file with this name.
.El
-.Sh DIAGNOSTICS
-The
-.Nm
-utility exits with a status of 0 on success
-and with a nonzero status if an error occurs.
+.Sh EXIT STATUS
+.Ex -std
.Sh SEE ALSO
.Xr kldunload 2 ,
.Xr kldload 8 ,
diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1
index 67daaa283adc..8b36e1f19934 100644
--- a/sbin/md5/md5.1
+++ b/sbin/md5/md5.1
@@ -82,7 +82,7 @@ Run a built-in time trial.
.It Fl x
Run a built-in test script.
.El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
The
.Nm md5 , sha1
and
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index b4189a5a9e94..9c6e0024aeed 100644
--- a/sbin/newfs_msdos/newfs_msdos.8
+++ b/sbin/newfs_msdos/newfs_msdos.8
@@ -182,7 +182,7 @@ on
.Xr disklabel 8 ,
.Xr fdisk 8 ,
.Xr newfs 8
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 on success and 1 on error.
.Sh HISTORY
The
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index 126c5f7477e9..44bf1af28ad2 100644
--- a/sbin/nfsiod/nfsiod.8
+++ b/sbin/nfsiod/nfsiod.8
@@ -71,7 +71,7 @@ If this fails, or no
KLD was available,
.Nm
exits with an error.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
.Xr nfsstat 1 ,
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index c2b24e41003a..de70c4794430 100644
--- a/sbin/ping6/ping6.8
+++ b/sbin/ping6/ping6.8
@@ -403,7 +403,7 @@ using the
.Fl p
option of
.Nm .
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
The
.Nm
utility returns 0 on success (the host is alive),
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 4220acb37299..45ffd195cd14 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -393,7 +393,7 @@ operation resulted in a route whose gateway uses the
same route as the one being changed.
The next-hop gateway should be reachable through a different route.
.El
-.Pp
+.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
.\".Xr esis 4 ,
diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8
index 380aaa5223d7..427833fb3077 100644
--- a/sbin/setkey/setkey.8
+++ b/sbin/setkey/setkey.8
@@ -633,7 +633,7 @@ algorithm comment
deflate rfc2394
.Ed
.\"
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.\"
.Sh EXAMPLES
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
diff --git a/usr.sbin/ac/ac.8 b/usr.sbin/ac/ac.8
index 969e612dba51..cfc5f299ada1 100644
--- a/usr.sbin/ac/ac.8
+++ b/usr.sbin/ac/ac.8
@@ -121,7 +121,7 @@ allows times recorded in
.Pa modems
to be charged out at a different rate than
.Pa other .
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh FILES
.Bl -tag -width /var/log/wtmp -compact
diff --git a/usr.sbin/bluetooth/bcmfw/bcmfw.8 b/usr.sbin/bluetooth/bcmfw/bcmfw.8
index a0661c220771..14a30123d94e 100644
--- a/usr.sbin/bluetooth/bcmfw/bcmfw.8
+++ b/usr.sbin/bluetooth/bcmfw/bcmfw.8
@@ -96,7 +96,7 @@ device:
.Sh BUGS
Most likely.
Please report if found.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
.Xr ubtbcmfw 4 ,
diff --git a/usr.sbin/bluetooth/bt3cfw/bt3cfw.8 b/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
index 74aa6d738124..a5c243823cbe 100644
--- a/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
+++ b/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
@@ -65,7 +65,7 @@ Connect to the specified Netgraph driver node of type
.El
.Sh BUGS
Please report if found.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
.Xr ng_bt3c 4
diff --git a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8 b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8
index 95327df3ac2b..3b1717471fb0 100644
--- a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8
+++ b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8
@@ -86,7 +86,7 @@ are:
.It Cm Known
.It Cm Forget
.El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh FILES
.Bl -tag -width ".Pa /etc/bluetooth/bthidd.conf" -compact
diff --git a/usr.sbin/bluetooth/hccontrol/hccontrol.8 b/usr.sbin/bluetooth/hccontrol/hccontrol.8
index 65cc53f01123..326d4173320d 100644
--- a/usr.sbin/bluetooth/hccontrol/hccontrol.8
+++ b/usr.sbin/bluetooth/hccontrol/hccontrol.8
@@ -171,7 +171,7 @@ are:
.Sh BUGS
Most likely.
Please report if found.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
.Xr bluetooth 3 ,
diff --git a/usr.sbin/bluetooth/l2control/l2control.8 b/usr.sbin/bluetooth/l2control/l2control.8
index e98f301df817..794b6a72a9a6 100644
--- a/usr.sbin/bluetooth/l2control/l2control.8
+++ b/usr.sbin/bluetooth/l2control/l2control.8
@@ -84,7 +84,7 @@ are:
.It Cm Read_Auto_Disconnect_Timeout
.It Cm Write_Auto_Disconnect_Timeout
.El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
.Xr netgraph 3 ,
diff --git a/usr.sbin/bluetooth/l2ping/l2ping.8 b/usr.sbin/bluetooth/l2ping/l2ping.8
index c03389240887..5d30239c99c2 100644
--- a/usr.sbin/bluetooth/l2ping/l2ping.8
+++ b/usr.sbin/bluetooth/l2ping/l2ping.8
@@ -103,7 +103,7 @@ Some implementations may not like large sizes and may hang or even crash.
.Sh BUGS
Could collect more statistic.
Could check for duplicated, corrupted and lost packets.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
.Xr bluetooth 3 ,
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8 b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
index d9b877771978..deb055068812 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
+++ b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
@@ -305,7 +305,7 @@ in
mode with
.Dq Li rfcomm-client
label.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh CAVEAT
The
diff --git a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
index 1f75eead81b2..38c802f67b7d 100644
--- a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
+++ b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
@@ -109,7 +109,7 @@ Protocol Descriptor List
.It
Bluetooth Profile Descriptor List
.El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
.Xr bluetooth 3 ,
diff --git a/usr.sbin/boot0cfg/boot0cfg.8 b/usr.sbin/boot0cfg/boot0cfg.8
index 9bfc8cb17161..7b92b6b0da0a 100644
--- a/usr.sbin/boot0cfg/boot0cfg.8
+++ b/usr.sbin/boot0cfg/boot0cfg.8
@@ -161,7 +161,7 @@ To boot slice 2 on the next boot:
To enable just slices 1 and 2 in the menu:
.Pp
.Dl "boot0cfg -m 0x3 ad0"
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
.Xr boot 8 ,
diff --git a/usr.sbin/boot98cfg/boot98cfg.8 b/usr.sbin/boot98cfg/boot98cfg.8
index 5a274439a119..5fb9a6a6fa31 100644
--- a/usr.sbin/boot98cfg/boot98cfg.8
+++ b/usr.sbin/boot98cfg/boot98cfg.8
@@ -97,7 +97,7 @@ The default sector size is 512
.Sh SEE ALSO
.Xr boot 8 ,
.Xr fdisk 8
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh AUTHORS
.An NOKUBI Hirotaka ,
diff --git a/usr.sbin/btxld/btxld.8 b/usr.sbin/btxld/btxld.8
index eee03554a309..4a0333a958ff 100644
--- a/usr.sbin/btxld/btxld.8
+++ b/usr.sbin/btxld/btxld.8
@@ -92,7 +92,7 @@ combined .text and .data segments of the client image.
.Sh SEE ALSO
.Xr ld 1 ,
.Xr boot 8
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh AUTHORS
.An Robert Nordier Aq rnordier@FreeBSD.org .
diff --git a/usr.sbin/chkgrp/chkgrp.8 b/usr.sbin/chkgrp/chkgrp.8
index e7a16060ca9d..257423798b18 100644
--- a/usr.sbin/chkgrp/chkgrp.8
+++ b/usr.sbin/chkgrp/chkgrp.8
@@ -60,7 +60,7 @@ will print an error message containing the name of the file being
scanned and the line number on which the error was found.
Otherwise no
output is produced.
-.Pp
+.Sh EXIT STATUS
The
.Nm
utility returns
diff --git a/usr.sbin/chown/chgrp.1 b/usr.sbin/chown/chgrp.1
index f085bff46484..5cfaa302090d 100644
--- a/usr.sbin/chown/chgrp.1
+++ b/usr.sbin/chown/chgrp.1
@@ -113,7 +113,7 @@ The user invoking
.Nm
must belong to the specified group and be the owner of the file,
or be the super-user.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh COMPATIBILITY
In previous versions of this system, symbolic links did not have groups.
diff --git a/usr.sbin/chown/chown.8 b/usr.sbin/chown/chown.8
index d8abeb4d8b90..cb7e170c0d38 100644
--- a/usr.sbin/chown/chown.8
+++ b/usr.sbin/chown/chown.8
@@ -132,7 +132,7 @@ group name.
.Pp
The ownership of a file may only be altered by a super-user for
obvious security reasons.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh COMPATIBILITY
Previous versions of the
diff --git a/usr.sbin/ckdist/ckdist.1 b/usr.sbin/ckdist/ckdist.1
index f784a07a5210..e52e20ca1bbe 100644
--- a/usr.sbin/ckdist/ckdist.1
+++ b/usr.sbin/ckdist/ckdist.1
@@ -89,7 +89,7 @@ is either "md5" or "inf").
.Sh SEE ALSO
.Xr cksum 1 ,
.Xr md5 1
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 if no errors were detected, 1 if errors were found in
a distribution, and 2 if usage errors, inaccessible input files, or
other system errors were encountered.
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1 b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
index ed3272960927..1aaecc7255cd 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
+++ b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
@@ -438,7 +438,7 @@ Completed deltas.
File containing the name and number of the next delta to be applied to this
source tree.
.El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
The
.Nm ctm_smail ,
.Nm ctm_dequeue
@@ -456,7 +456,7 @@ apply a completed delta with
is not considered an error important enough to bounce the mail, and
.Nm ctm_rmail
returns an exit status of 0.
-.Pp
+.Sh DIAGNOSTICS
In normal operation,
.Nm ctm_smail
will report messages like:
diff --git a/usr.sbin/daemon/daemon.8 b/usr.sbin/daemon/daemon.8
index a1048fd78724..74b5b81bc874 100644
--- a/usr.sbin/daemon/daemon.8
+++ b/usr.sbin/daemon/daemon.8
@@ -58,7 +58,7 @@ Note, that the file will be created shortly before the process is
actually executed, and will remain after the process exits (although
it will be removed if the execution fails).
.El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
The
.Nm
utility exits 1 if an error is returned by the
@@ -67,6 +67,7 @@ library routine, 2 if the
.Ar pidfile
is requested, but cannot be opened,
otherwise 0.
+.Sh DIAGNOSTICS
If the command cannot be executed, an error message is displayed on
standard error unless the
.Fl f
diff --git a/usr.sbin/faithd/faithd.8 b/usr.sbin/faithd/faithd.8
index e50d7b57ef42..5d16989902fa 100644
--- a/usr.sbin/faithd/faithd.8
+++ b/usr.sbin/faithd/faithd.8
@@ -268,7 +268,7 @@ the traffic will be denied.
With inetd mode,
traffic may be filtered by using access control functionality in
.Xr inetd 8 .
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
The
.Nm
utility exits with
diff --git a/usr.sbin/fdread/fdread.1 b/usr.sbin/fdread/fdread.1
index 090a91dfbd2b..5a4ecc29a670 100644
--- a/usr.sbin/fdread/fdread.1
+++ b/usr.sbin/fdread/fdread.1
@@ -158,7 +158,7 @@ option.
.It Pa /dev/fd0
Default device to read from.
.El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
The
.Nm
utility sets the exit value according to
@@ -166,7 +166,7 @@ utility sets the exit value according to
In recovery mode, the exit value will be set to
.Dv EX_IOERR
if any error occurred during processing (even in quiet mode).
-.Pp
+.Sh DIAGNOSTICS
Unless running in quiet mode, upon encountering an error, the status
of the floppy disc controller (FDC) will be printed out, both in
hexadecimal form, followed by a textual description that translates
diff --git a/usr.sbin/flowctl/flowctl.8 b/usr.sbin/flowctl/flowctl.8
index 67f5bd5d92b0..c9104cb11310 100644
--- a/usr.sbin/flowctl/flowctl.8
+++ b/usr.sbin/flowctl/flowctl.8
@@ -62,7 +62,7 @@ This command is the analog of the
command of a Cisco router.
It dumps the contents of the flow cache in Cisco-like format.
.El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
.Xr netgraph 3 ,
diff --git a/usr.sbin/gstat/gstat.8 b/usr.sbin/gstat/gstat.8
index abdde06c47ed..b384075fb377 100644
--- a/usr.sbin/gstat/gstat.8
+++ b/usr.sbin/gstat/gstat.8
@@ -69,7 +69,7 @@ or
(the default) indicates that the update interval is specified in
seconds, milliseconds, or microseconds, respectively.
.El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
.Xr geom 4
diff --git a/usr.sbin/i4b/isdnd/isdnd.8 b/usr.sbin/i4b/isdnd/isdnd.8
index 42c01f179426..5b311fb77467 100644
--- a/usr.sbin/i4b/isdnd/isdnd.8
+++ b/usr.sbin/i4b/isdnd/isdnd.8
@@ -408,7 +408,7 @@ will start
with reasonable debugging messages enabled, full-screen mode of operation,
full-screen display redirected to /dev/ttyv3 and using a termcap entry
for vt100 on this display.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 on success, 1 on error.
.Sh SEE ALSO
.Xr i4bing 4 ,
diff --git a/usr.sbin/i4b/isdnmonitor/isdnmonitor.8 b/usr.sbin/i4b/isdnmonitor/isdnmonitor.8
index 1fb1b70f5cbc..6a8b80143685 100644
--- a/usr.sbin/i4b/isdnmonitor/isdnmonitor.8
+++ b/usr.sbin/i4b/isdnmonitor/isdnmonitor.8
@@ -160,7 +160,7 @@ to monitor a locally running isdnd:
.Bd -literal -offset indent
isdnmonitor -h localhost
.Ed
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 on success, 1 on error.
.Sh SEE ALSO
.Xr isdnd 8
diff --git a/usr.sbin/ip6addrctl/ip6addrctl.8 b/usr.sbin/ip6addrctl/ip6addrctl.8
index 018743b95051..59154d447b1e 100644
--- a/usr.sbin/ip6addrctl/ip6addrctl.8
+++ b/usr.sbin/ip6addrctl/ip6addrctl.8
@@ -104,7 +104,7 @@ are
comments and are ignored.
.El
.\"
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.\"
.Sh SEE ALSO
diff --git a/usr.sbin/kgzip/kgzip.8 b/usr.sbin/kgzip/kgzip.8
index 3537502c975b..58811c1bc55f 100644
--- a/usr.sbin/kgzip/kgzip.8
+++ b/usr.sbin/kgzip/kgzip.8
@@ -129,7 +129,7 @@ The default loader
.Xr elf 5 ,
.Xr boot 8 ,
.Xr loader 8
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh AUTHORS
.An Robert Nordier Aq rnordier@FreeBSD.org .
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 699120b5a5c1..8cd8b25ace06 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -373,7 +373,7 @@ with all values commented out:
.%T The Cutting Edge (using make world)
.%A Nik Clayton
.Re
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 on successful completion, or if the user bails out
manually at some point during execution.
.Pp
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8
index 124b45f9f313..85a1fe816e20 100644
--- a/usr.sbin/mtree/mtree.8
+++ b/usr.sbin/mtree/mtree.8
@@ -341,7 +341,7 @@ distribution.
.It Pa /etc/mtree
system specification directory
.El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
.Xr chflags 1 ,
diff --git a/usr.sbin/ndp/ndp.8 b/usr.sbin/ndp/ndp.8
index b39625a19edb..00dc92612a55 100644
--- a/usr.sbin/ndp/ndp.8
+++ b/usr.sbin/ndp/ndp.8
@@ -225,7 +225,7 @@ Most useful when used with
.Fl A .
.El
.\"
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.\"
.Sh SEE ALSO
diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8
index df614e7a9f6a..64c181e66c9c 100644
--- a/usr.sbin/nfsd/nfsd.8
+++ b/usr.sbin/nfsd/nfsd.8
@@ -172,7 +172,7 @@ If you have to kill
.Nm
just do a
.Dq Li "kill -USR1 <PID of master nfsd>"
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
.Xr nfsstat 1 ,
diff --git a/usr.sbin/ngctl/ngctl.8 b/usr.sbin/ngctl/ngctl.8
index 121c0f17e50e..ce77069d3185 100644
--- a/usr.sbin/ngctl/ngctl.8
+++ b/usr.sbin/ngctl/ngctl.8
@@ -124,7 +124,7 @@ The
.Dq help
command displays the available
commands, their usage and aliases, and a brief description.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
.Xr netgraph 3 ,
diff --git a/usr.sbin/pcvt/ispcvt/ispcvt.8 b/usr.sbin/pcvt/ispcvt/ispcvt.8
index b9eee0a86c3a..8e73e0929182 100644
--- a/usr.sbin/pcvt/ispcvt/ispcvt.8
+++ b/usr.sbin/pcvt/ispcvt/ispcvt.8
@@ -73,7 +73,7 @@ with the
.Fl c
option gives a verbose listing of the compile-time options.
.El
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
The
.Nm
utility exits with one of the following values:
diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8
index 2753bee04185..75bd91493529 100644
--- a/usr.sbin/periodic/periodic.8
+++ b/usr.sbin/periodic/periodic.8
@@ -222,9 +222,10 @@ daily_show_badconfig=NO
.Xr periodic.conf 5 ,
.Xr cron 8 ,
.Xr newsyslog 8
+.Sh EXIT STATUS
+Exit status is 0 on success and 1 if the command fails.
.Sh DIAGNOSTICS
-Exit status is 0 on success and 1 if the command
-fails for one of the following reasons:
+The command may fail for one of the following reasons:
.Bl -diag
.It usage: periodic <directory of files to execute>
No directory path argument was passed to
diff --git a/usr.sbin/pkg_install/sign/pkg_sign.1 b/usr.sbin/pkg_install/sign/pkg_sign.1
index 118d380f4705..68312940f4a6 100644
--- a/usr.sbin/pkg_install/sign/pkg_sign.1
+++ b/usr.sbin/pkg_install/sign/pkg_sign.1
@@ -128,7 +128,7 @@ signing scheme uses eight bytes markers such
.Sq CKSHA1
+ length for its signatures (those markers are conveniently
eight bytes long).
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
The
.Nm
and
@@ -139,6 +139,7 @@ For
.Nm pkg_check ,
this usually indicates that the package is not signed, or that the
signature is forged.
+.Sh DIAGNOSTICS
.Bl -diag
.It "File %s is already signed"
There is a signature embedded within the gzip file already.
diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8
index 22795014693a..fb25c46ed481 100644
--- a/usr.sbin/pw/pw.8
+++ b/usr.sbin/pw/pw.8
@@ -821,7 +821,7 @@ The
and
.Fl q
options as described above are accepted by these commands.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
The
.Nm
utility returns EXIT_SUCCESS on successful operation, otherwise
diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1
index a694935b54f2..732fb12b7ebd 100644
--- a/usr.sbin/rtprio/rtprio.1
+++ b/usr.sbin/rtprio/rtprio.1
@@ -113,7 +113,7 @@ highest priority
of 0 means "the current process".
.Pp
Only root is allowed to set realtime or idle priority for a process.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
If
.Nm
execute a command, the exit value is that of the command executed.
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index ac78d24ee1d0..68836ab149cf 100644
--- a/usr.sbin/sa/sa.8
+++ b/usr.sbin/sa/sa.8
@@ -204,7 +204,7 @@ flag is specified, only the
and
.Fl s
flags are honored.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.Sh FILES
.Bl -tag -width /var/account/usracct -compact
diff --git a/usr.sbin/setkey/setkey.8 b/usr.sbin/setkey/setkey.8
index 380aaa5223d7..427833fb3077 100644
--- a/usr.sbin/setkey/setkey.8
+++ b/usr.sbin/setkey/setkey.8
@@ -633,7 +633,7 @@ algorithm comment
deflate rfc2394
.Ed
.\"
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
.Ex -std
.\"
.Sh EXAMPLES
diff --git a/usr.sbin/smbmsg/smbmsg.8 b/usr.sbin/smbmsg/smbmsg.8
index 7bcbf028f4d3..b221ced33469 100644
--- a/usr.sbin/smbmsg/smbmsg.8
+++ b/usr.sbin/smbmsg/smbmsg.8
@@ -259,10 +259,11 @@ Send a
command to device at address 0xa0.
For the PCF8583 RTC, this would set the clock to Sunday (2004%4)-05-16
22:07:00.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
Exit status is 0 on success, or according to
.Xr sysexits 3
in case of failure.
+.Sh DIAGNOSTICS
Diagnostic messages issued are supposed to be self-explanatory.
.Sh SEE ALSO
.Xr printf 3 ,