5 files changed, 33 insertions, 37 deletions
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index 9164c46ce86..a757a20bfa1 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dump.8,v 1.51 2016/10/06 11:43:30 schwarze Exp $
+.\"	$OpenBSD: dump.8,v 1.52 2018/06/07 11:37:21 jmc Exp $
 .\"	$NetBSD: dump.8,v 1.17 1997/06/05 11:15:06 lukem Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)dump.8	8.1 (Berkeley) 6/16/93
 .\"
-.Dd $Mdocdate: October 6 2016 $
+.Dd $Mdocdate: June 7 2018 $
 .Dt DUMP 8
 .Os
 .Sh NAME
@@ -426,13 +426,13 @@ dump table: file systems and frequency
 to find group
 .Em operator
 .El
-.Sh DIAGNOSTICS
-Many, and verbose.
-.Pp
+.Sh EXIT STATUS
 .Nm
 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.
+.Sh DIAGNOSTICS
+Many, and verbose.
 .Sh SEE ALSO
 .Xr chflags 1 ,
 .Xr stty 1 ,
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
index dddd39a2927..412e2c7aa91 100644
--- a/usr.bin/mktemp/mktemp.1
+++ b/usr.bin/mktemp/mktemp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mktemp.1,v 1.28 2013/08/07 06:19:36 deraadt Exp $
+.\"	$OpenBSD: mktemp.1,v 1.29 2018/06/07 11:37:21 jmc Exp $
 .\"
 .\" Copyright (c) 1996, 2000, 2001, 2003, 2010, 2013
 .\"	Todd C. Miller <Todd.Miller@courtesan.com>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 7 2013 $
+.Dd $Mdocdate: June 7 2018 $
 .Dt MKTEMP 1
 .Os
 .Sh NAME
@@ -142,11 +142,6 @@ This is slightly better than
 but still introduces a race condition.
 Use of this option is not encouraged.
 .El
-.Pp
-The
-.Nm
-utility
-exits with a value of 0 on success or 1 on failure.
 .Sh ENVIRONMENT
 .Bl -tag -width TMPDIR
 .It Ev TMPDIR
@@ -154,6 +149,8 @@ directory in which to place the temporary file when in
 .Fl t
 mode
 .El
+.Sh EXIT STATUS
+.Ex -std mktemp
 .Sh EXAMPLES
 The following
 .Xr sh 1
diff --git a/usr.bin/rcs/merge.1 b/usr.bin/rcs/merge.1
index cf4405ac299..7794d78594a 100644
--- a/usr.bin/rcs/merge.1
+++ b/usr.bin/rcs/merge.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: merge.1,v 1.3 2010/10/28 15:08:50 jmc Exp $
+.\"	$OpenBSD: merge.1,v 1.4 2018/06/07 11:37:21 jmc Exp $
 .\"
 .\" Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
 .\" All rights reserved.
@@ -14,7 +14,7 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.Dd $Mdocdate: October 28 2010 $
+.Dd $Mdocdate: June 7 2018 $
 .Dt MERGE 1
 .Os
 .Sh NAME
@@ -57,16 +57,7 @@ Be quiet about reporting.
 .It Fl V
 Print RCS's version number.
 .El
-.Sh EXAMPLES
-Using labels:
-.Bd -literal -offset indent
-$ merge -q -p -L one -L two -L three file1 file2 file3
-<<<<<<< one
-=======
-bar
->>>>>>> three
-.Ed
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 The
 .Nm
 utility exits with one of the following values:
@@ -79,6 +70,15 @@ Overlaps were found.
 .It 2
 An error occurred.
 .El
+.Sh EXAMPLES
+Using labels:
+.Bd -literal -offset indent
+$ merge -q -p -L one -L two -L three file1 file2 file3
+<<<<<<< one
+=======
+bar
+>>>>>>> three
+.Ed
 .Sh SEE ALSO
 .Xr co 1 ,
 .Xr diff 1 ,
diff --git a/usr.sbin/fdformat/fdformat.1 b/usr.sbin/fdformat/fdformat.1
index ebad8a540c1..35220ac6c21 100644
--- a/usr.sbin/fdformat/fdformat.1
+++ b/usr.sbin/fdformat/fdformat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fdformat.1,v 1.19 2017/01/08 01:32:02 schwarze Exp $
+.\"	$OpenBSD: fdformat.1,v 1.20 2018/06/07 11:37:21 jmc Exp $
 .\"
 .\" Copyright (C) 1993, 1994 by Joerg Wunsch, Dresden
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 8 2017 $
+.Dd $Mdocdate: June 7 2018 $
 .Dt FDFORMAT 1
 .Os
 .Sh NAME
@@ -93,6 +93,12 @@ of the intended formatting process.
 In order to continue, an answer of
 .Dq y
 must be given.
+.Sh EXIT STATUS
+An exit status of 0 is returned upon successful operation.
+Exit status
+1 is returned on any errors during floppy formatting, and an exit status
+of 2 reflects invalid arguments given to the program (along with
+appropriate information written to diagnostic output).
 .Sh DIAGNOSTICS
 Unless
 .Fl q
@@ -105,12 +111,6 @@ is printed when the track(s) is being formatted, then a
 while it's being verified, and if an error has been detected, it
 will finally change to
 .Dq E .
-.Pp
-An exit status of 0 is returned upon successful operation.
-Exit status
-1 is returned on any errors during floppy formatting, and an exit status
-of 2 reflects invalid arguments given to the program (along with
-appropriate information written to diagnostic output).
 .Sh SEE ALSO
 .Xr fdc 4
 .Sh HISTORY
diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.8 b/usr.sbin/netgroup_mkdb/netgroup_mkdb.8
index bb9b2ac531a..69ebb9def08 100644
--- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.8
+++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: netgroup_mkdb.8,v 1.8 2015/11/30 17:03:05 jmc Exp $
+.\"	$OpenBSD: netgroup_mkdb.8,v 1.9 2018/06/07 11:37:21 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Christos Zoulas
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 30 2015 $
+.Dd $Mdocdate: June 7 2018 $
 .Dt NETGROUP_MKDB 8
 .Os
 .Sh NAME
@@ -58,9 +58,6 @@ Put the output databases in the named file.
 .Pp
 The databases are used by the C library netgroup routines (see
 .Xr getnetgrent 3 ) .
-.Pp
-.Nm netgroup_mkdb
-exits zero on success, non-zero on failure.
 .Sh FILES
 .Bl -tag -width 24n -compact
 .It Pa /etc/netgroup.db
@@ -70,6 +67,8 @@ a temporary file
 .It Pa /etc/netgroup
 current netgroup file
 .El
+.Sh EXIT STATUS
+.Ex -std netgroup_mkdb
 .Sh SEE ALSO
 .Xr dbopen 3 ,
 .Xr getnetgrent 3 ,