diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index a6f0e55860cc..231bb9e9cbff 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -59,7 +59,7 @@ are specified, modifying the input as specified by a list of commands.
 The input is then written to the standard output.
 .Pp
 A single command may be specified as the first argument to
-.Nm sed .
+.Nm Ns .
 Multiple commands may be specified by using the
 .Fl e
 or
@@ -506,10 +506,10 @@ This is the same as specifying the
 .Fl n
 option on the command line.
 .El
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
-utility exits 0 on success and >0 if an error occurs.
+utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr awk 1 ,
 .Xr ed 1 ,
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index 8ffb8b7c8683..de4daf216433 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.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
diff --git a/usr.bin/tee/tee.1 b/usr.bin/tee/tee.1
index adacd0764ff5..f56bd4ebd7e5 100644
--- a/usr.bin/tee/tee.1
+++ b/usr.bin/tee/tee.1
@@ -76,13 +76,13 @@ utility takes the default action for all signals,
 except in the event of the
 .Fl i
 option.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh STANDARDS
 The
 .Nm
-function is expected to be
+utility is expected to be
 .St -p1003.2
 compatible.
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index b1583f316f67..ba5b0c800265 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -123,7 +123,7 @@ If the
 .Dq SS
 letter pair is not specified, the value defaults to 0.
 .El
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index 7403dba1619b..489577f6b3f5 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -228,7 +228,7 @@ If
 has a leading zero, it is interpreted as an octal value, otherwise,
 it's interpreted as a decimal value.
 .El
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index e14dd517cda1..f1db0737c91d 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -114,7 +114,7 @@ Case insensitive comparison of lines.
 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.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index 86fc751fe7ac..388862b01a63 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -83,7 +83,7 @@ The default action is equivalent to specifying all of the flags.
 .Pp
 If no files are specified, the standard input is used and no
 file name is displayed.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index f9a77baf29f2..941577788a89 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -153,9 +153,10 @@ utility attempts to prevent moving a file onto itself.
 Installing
 .Pa /dev/null
 creates an empty file.
-.Pp
-Upon successful completion a value of 0 is returned.
-Otherwise, a value of 1 is returned.
+.Sh DIAGNOSTICS
+The
+.Nm
+utility exits 0 on success, and 1 otherwise.
 .Sh FILES
 .Bl -tag -width INS@XXXX -compact
 .It Pa INS@XXXX