22 files changed, 82 insertions, 82 deletions
diff --git a/usr.sbin/ac/ac.8 b/usr.sbin/ac/ac.8
index fca37966f6b..d69720d5f06 100644
--- a/usr.sbin/ac/ac.8
+++ b/usr.sbin/ac/ac.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ac.8,v 1.21 2010/07/04 10:17:25 millert Exp $
+.\"	$OpenBSD: ac.8,v 1.22 2010/09/03 11:22:36 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Simon J. Gerraty
 .\" Copyright (c) 1994 Christopher G. Demetriou
@@ -29,7 +29,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: July 4 2010 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt AC 8
 .Os
 .Sh NAME
@@ -115,8 +115,6 @@ for more information.
 No login or connect time accounting is performed if
 .Pa /var/log/wtmp
 does not exist.
-.Pp
-.Ex -std ac
 .Sh FILES
 .Bl -tag -width "/var/log/wtmp.[0-7]XX" -compact
 .It Pa /var/log/wtmp
@@ -124,6 +122,8 @@ connect time accounting file
 .It Pa /var/log/wtmp.[0-7]
 rotated files
 .El
+.Sh EXIT STATUS
+.Ex -std ac
 .Sh EXAMPLES
 Allow times recorded in
 .Pa modems
diff --git a/usr.sbin/httpd/src/support/apachectl.8 b/usr.sbin/httpd/src/support/apachectl.8
index 9f47b3c0cb3..3982af777af 100644
--- a/usr.sbin/httpd/src/support/apachectl.8
+++ b/usr.sbin/httpd/src/support/apachectl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apachectl.8,v 1.9 2008/06/07 01:59:36 jdixon Exp $
+.\"	$OpenBSD: apachectl.8,v 1.10 2010/09/03 11:22:36 jmc Exp $
 .\"
 .\" ====================================================================
 .\" The Apache Software License, Version 1.1
@@ -57,7 +57,7 @@
 .\" originally written at the National Center for Supercomputing Applications,
 .\" University of Illinois, Urbana-Champaign.
 .\"
-.Dd $Mdocdate: June 7 2008 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt APACHECTL 8
 .Os
 .Sh NAME
@@ -153,8 +153,7 @@ except that the list of requests currently being served is omitted.
 Stop
 .Xr httpd 8 .
 .El
-.Pp
-.Ex -std apachectl
+.Sh EXIT STATUS
 The exit codes returned are:
 .Pp
 .Bl -tag -width "XXX" -offset indent -compact
diff --git a/usr.sbin/httpd/src/support/htpasswd.1 b/usr.sbin/httpd/src/support/htpasswd.1
index ca5dccb4a66..663de03d237 100644
--- a/usr.sbin/httpd/src/support/htpasswd.1
+++ b/usr.sbin/httpd/src/support/htpasswd.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: htpasswd.1,v 1.16 2008/06/07 01:59:36 jdixon Exp $
+.\"	$OpenBSD: htpasswd.1,v 1.17 2010/09/03 11:22:36 jmc Exp $
 .\"
 .\" ====================================================================
 .\" The Apache Software License, Version 1.1
@@ -57,7 +57,7 @@
 .\" originally written at the National Center for Supercomputing Applications,
 .\" University of Illinois, Urbana-Champaign.
 .\"
-.Dd $Mdocdate: June 7 2008 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt HTPASSWD 1
 .Os
 .Sh NAME
@@ -229,8 +229,7 @@ be contained within
 .Dq ServerRoot ,
 they should not be located in
 .Dq DocumentRoot .
-.Pp
-.Ex -std htpasswd
+.Sh EXIT STATUS
 The exit codes returned are:
 .Pp
 .Bl -tag -width "XXX" -offset indent -compact
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8
index 2ca574eb131..8464dcb4986 100644
--- a/usr.sbin/mtree/mtree.8
+++ b/usr.sbin/mtree/mtree.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mtree.8,v 1.34 2010/07/15 20:51:38 schwarze Exp $
+.\"	$OpenBSD: mtree.8,v 1.35 2010/09/03 11:22:36 jmc Exp $
 .\"	$NetBSD: mtree.8,v 1.4 1995/03/07 21:26:25 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)mtree.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: July 15 2010 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt MTREE 8
 .Os
 .Sh NAME
@@ -285,7 +285,12 @@ Empty lines and lines whose first non-whitespace character is a hash
 mark
 .Pq Sq #
 are ignored.
-.Pp
+.Sh FILES
+.Bl -tag -width /etc/mtree -compact
+.It Pa /etc/mtree
+system specification directory
+.El
+.Sh EXIT STATUS
 The
 .Nm mtree
 utility exits with a status of 0 on success, 1 if any error occurred,
@@ -293,11 +298,6 @@ and 2 if the file hierarchy did not match the specification.
 A status of 2 is converted to a status of 0 if the
 .Fl U
 option is used.
-.Sh FILES
-.Bl -tag -width /etc/mtree -compact
-.It Pa /etc/mtree
-system specification directory
-.El
 .Sh EXAMPLES
 To detect system binaries that have been
 .Dq trojan horsed ,
diff --git a/usr.sbin/ndp/ndp.8 b/usr.sbin/ndp/ndp.8
index 6c3a015a520..99a5ce7cb33 100644
--- a/usr.sbin/ndp/ndp.8
+++ b/usr.sbin/ndp/ndp.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ndp.8,v 1.26 2008/05/18 10:00:49 sobrado Exp $
+.\"	$OpenBSD: ndp.8,v 1.27 2010/09/03 11:22:36 jmc Exp $
 .\"	$KAME: ndp.8,v 1.28 2002/07/17 08:46:33 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 18 2008 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt NDP 8
 .Os
 .\"
@@ -218,7 +218,7 @@ making it possible to merge output with
 Most useful when used with
 .Fl A .
 .El
-.Pp
+.Sh EXIT STATUS
 .Ex -std ndp
 .\"
 .Sh SEE ALSO
diff --git a/usr.sbin/procmap/procmap.1 b/usr.sbin/procmap/procmap.1
index a0d6af38d8c..769d1e54998 100644
--- a/usr.sbin/procmap/procmap.1
+++ b/usr.sbin/procmap/procmap.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: procmap.1,v 1.12 2009/01/19 09:46:59 sobrado Exp $
+.\"	$OpenBSD: procmap.1,v 1.13 2010/09/03 11:22:36 jmc Exp $
 .\"	$NetBSD: pmap.1,v 1.6 2003/01/19 21:25:43 atatat Exp $
 .\"
 .\" Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 19 2009 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt PROCMAP 1
 .Os
 .Sh NAME
@@ -182,7 +182,7 @@ If you do wish to see information about
 and another process as the same time, simply omit the
 .Fl p
 and place the extra PID at the end of the command line.
-.Pp
+.Sh EXIT STATUS
 .Ex -std procmap
 .Sh EXAMPLES
 While the meaning most of the output is self-evident, some pieces of
diff --git a/usr.sbin/rtadvd/rtadvd.8 b/usr.sbin/rtadvd/rtadvd.8
index eb2fa26839f..b43be8cbd44 100644
--- a/usr.sbin/rtadvd/rtadvd.8
+++ b/usr.sbin/rtadvd/rtadvd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rtadvd.8,v 1.27 2008/06/09 06:23:10 jmc Exp $
+.\"	$OpenBSD: rtadvd.8,v 1.28 2010/09/03 11:22:36 jmc Exp $
 .\"	$KAME: rtadvd.8,v 1.18 2002/04/28 10:43:02 jinmei Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 9 2008 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt RTADVD 8
 .Os
 .Sh NAME
@@ -146,8 +146,6 @@ In this case,
 will transmit router advertisement with router lifetime 0
 to all the interfaces
 .Pq in accordance with RFC 2461 6.2.5 .
-.Pp
-.Ex -std rtadvd
 .Sh FILES
 .Bl -tag -width "/var/run/rtadvd.pidXX" -compact
 .It Pa /etc/rtadvd.conf
@@ -156,6 +154,8 @@ The default configuration file.
 Contains the PID of the currently running
 .Nm .
 .El
+.Sh EXIT STATUS
+.Ex -std rtadvd
 .Sh SEE ALSO
 .Xr rtadvd.conf 5 ,
 .Xr rtsol 8 ,
diff --git a/usr.sbin/rtsold/rtsold.8 b/usr.sbin/rtsold/rtsold.8
index 00fd809968d..ee682203e2b 100644
--- a/usr.sbin/rtsold/rtsold.8
+++ b/usr.sbin/rtsold/rtsold.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rtsold.8,v 1.26 2008/06/10 10:42:23 jmc Exp $
+.\"	$OpenBSD: rtsold.8,v 1.27 2010/09/03 11:22:36 jmc Exp $
 .\"	$KAME: rtsold.8,v 1.17 2001/07/09 22:30:37 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 10 2008 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt RTSOLD 8
 .Os
 .\"
@@ -225,8 +225,6 @@ and the file itself should be a regular file
 and owned by the same user running
 .Nm .
 .El
-.Pp
-.Ex -std rtsold
 .\"
 .Sh FILES
 .Bl -tag -width "/var/run/rtsold.dumpXX" -compact
@@ -234,6 +232,9 @@ and owned by the same user running
 Internal state dump file.
 .El
 .\"
+.Sh EXIT STATUS
+.Ex -std rtsold
+.\"
 .Sh SEE ALSO
 .Xr hostname.if 5 ,
 .Xr netstart 8 ,
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index 44aa826cf53..bf2e6b1aac7 100644
--- a/usr.sbin/sa/sa.8
+++ b/usr.sbin/sa/sa.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sa.8,v 1.17 2007/05/31 19:20:29 jmc Exp $
+.\"	$OpenBSD: sa.8,v 1.18 2010/09/03 11:22:36 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" 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: May 31 2007 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt SA 8
 .Os
 .Sh NAME
@@ -205,8 +205,6 @@ flag is specified, only the
 and
 .Fl s
 flags are honored.
-.Pp
-.Ex -std sa
 .Sh FILES
 .Bl -tag -width /var/account/usracct -compact
 .It Pa /var/account/acct
@@ -216,6 +214,8 @@ per-command accounting summary database
 .It Pa /var/account/usracct
 per-user accounting summary database
 .El
+.Sh EXIT STATUS
+.Ex -std sa
 .Sh SEE ALSO
 .Xr lastcomm 1 ,
 .Xr acct 5 ,
diff --git a/usr.sbin/smtpd/makemap.8 b/usr.sbin/smtpd/makemap.8
index 007f4d1ff1e..ad70bf7580f 100644
--- a/usr.sbin/smtpd/makemap.8
+++ b/usr.sbin/smtpd/makemap.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: makemap.8,v 1.13 2009/11/04 08:31:26 jmc Exp $
+.\"	$OpenBSD: makemap.8,v 1.14 2010/09/03 11:22:36 jmc Exp $
 .\"
 .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@openbsd.org>
 .\" Copyright (c) 2008-2009 Gilles Chechade <gilles@openbsd.org>
@@ -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: November 4 2009 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt MAKEMAP 8
 .Os
 .Sh NAME
@@ -76,7 +76,6 @@ This format can be used for building primary domain maps.
 .El
 .Pp
 .El
-.Ex -std makemap
 .Sh PRIMARY DOMAINS
 Primary domains can be kept in maps.
 To create a primary domain map, add each primary domain on a
@@ -114,6 +113,8 @@ List of hosted virtual domains.
 .It Pa /etc/mail/secrets
 List of remote host credentials.
 .El
+.Sh EXIT STATUS
+.Ex -std makemap
 .Sh SEE ALSO
 .Xr aliases 5 ,
 .Xr smtpd.conf 5 ,
diff --git a/usr.sbin/smtpd/newaliases.8 b/usr.sbin/smtpd/newaliases.8
index 74717d25bb7..2f3ef7fab41 100644
--- a/usr.sbin/smtpd/newaliases.8
+++ b/usr.sbin/smtpd/newaliases.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: newaliases.8,v 1.7 2009/04/16 20:13:13 sobrado Exp $
+.\"	$OpenBSD: newaliases.8,v 1.8 2010/09/03 11:22:36 jmc Exp $
 .\"
 .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@openbsd.org>
 .\" Copyright (c) 2008-2009 Gilles Chechade <gilles@openbsd.org>
@@ -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: April 16 2009 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt NEWALIASES 8
 .Os
 .Sh NAME
@@ -50,8 +50,6 @@ The preferred way of rebuilding the database is with
 .Bd -literal -offset indent
 # makemap -t aliases /etc/mail/aliases
 .Ed
-.Pp
-.Ex -std newaliases
 .Sh FILES
 .Bl -tag -width "/etc/mail/aliasesXXX" -compact
 .It Pa /etc/mail/aliases
@@ -59,6 +57,8 @@ List of local user mail aliases.
 .It Pa /etc/mail/virtual
 List of virtual host aliases.
 .El
+.Sh EXIT STATUS
+.Ex -std newaliases
 .Sh SEE ALSO
 .Xr smtpd.conf 5 ,
 .Xr makemap 8
diff --git a/usr.sbin/traceroute6/traceroute6.8 b/usr.sbin/traceroute6/traceroute6.8
index 5755f0edba9..0cd3488e311 100644
--- a/usr.sbin/traceroute6/traceroute6.8
+++ b/usr.sbin/traceroute6/traceroute6.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: traceroute6.8,v 1.12 2007/05/31 19:20:30 jmc Exp $
+.\"	$OpenBSD: traceroute6.8,v 1.13 2010/09/03 11:22:36 jmc Exp $
 .\"	$KAME: traceroute6.8,v 1.9 2002/08/30 03:56:20 onoe Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt TRACEROUTE6 8
 .Os
 .\"
@@ -105,7 +105,7 @@ Be verbose.
 .It Fl w Ar waittime
 Specify the time delay between probes.
 .El
-.Pp
+.Sh EXIT STATUS
 .Ex -std traceroute6
 .\"
 .Sh SEE ALSO
diff --git a/usr.sbin/user/group.8 b/usr.sbin/user/group.8
index 0ba8270e73a..ff2ac8e6ceb 100644
--- a/usr.sbin/user/group.8
+++ b/usr.sbin/user/group.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: group.8,v 1.14 2009/01/19 09:46:59 sobrado Exp $
+.\" $OpenBSD: group.8,v 1.15 2010/09/03 11:22:36 jmc Exp $
 .\" $NetBSD: group.8,v 1.10 2003/02/25 10:36:21 wiz Exp $
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 19 2009 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt GROUP 8
 .Os
 .Sh NAME
@@ -69,7 +69,7 @@ and
 commands.
 .Pp
 For a full explanation of the options, please see the relevant manual page.
-.Pp
+.Sh EXIT STATUS
 .Ex -std group
 .Sh SEE ALSO
 .Xr group 5 ,
diff --git a/usr.sbin/user/groupadd.8 b/usr.sbin/user/groupadd.8
index e9656f5d4b4..5ae9e6f653a 100644
--- a/usr.sbin/user/groupadd.8
+++ b/usr.sbin/user/groupadd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: groupadd.8,v 1.14 2009/01/21 16:56:02 sobrado Exp $
+.\" $OpenBSD: groupadd.8,v 1.15 2010/09/03 11:22:36 jmc Exp $
 .\" $NetBSD: groupadd.8,v 1.9 2003/02/14 16:11:37 grant Exp $
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 21 2009 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt GROUPADD 8
 .Os
 .Sh NAME
@@ -55,7 +55,7 @@ Allows the new group to have a GID which is already in use for another group.
 .It Fl v
 Enables verbose mode - explain the commands as they are executed.
 .El
-.Pp
+.Sh EXIT STATUS
 .Ex -std groupadd
 .Sh SEE ALSO
 .Xr group 5 ,
diff --git a/usr.sbin/user/groupdel.8 b/usr.sbin/user/groupdel.8
index 2fa588148de..9ef497713d1 100644
--- a/usr.sbin/user/groupdel.8
+++ b/usr.sbin/user/groupdel.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: groupdel.8,v 1.14 2009/01/21 16:56:02 sobrado Exp $
+.\" $OpenBSD: groupdel.8,v 1.15 2010/09/03 11:22:36 jmc Exp $
 .\" $NetBSD: groupdel.8,v 1.9 2003/02/14 16:11:37 grant Exp $
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 21 2009 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt GROUPDEL 8
 .Os
 .Sh NAME
@@ -50,7 +50,7 @@ The options are as follows:
 .It Fl v
 Enables verbose mode - explain the commands as they are executed.
 .El
-.Pp
+.Sh EXIT STATUS
 .Ex -std groupdel
 .Sh SEE ALSO
 .Xr group 5 ,
diff --git a/usr.sbin/user/groupinfo.8 b/usr.sbin/user/groupinfo.8
index cd66729243b..454076779ba 100644
--- a/usr.sbin/user/groupinfo.8
+++ b/usr.sbin/user/groupinfo.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: groupinfo.8,v 1.12 2008/12/20 09:40:47 jmc Exp $
+.\" $OpenBSD: groupinfo.8,v 1.13 2010/09/03 11:22:36 jmc Exp $
 .\" $NetBSD: groupinfo.8,v 1.3 2000/10/03 19:32:23 bjh21 Exp $
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: December 20 2008 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt GROUPINFO 8
 .Os
 .Sh NAME
@@ -60,7 +60,7 @@ name or GID is already in use on the system.
 The
 .Ar group
 argument may be either a group name or a GID.
-.Pp
+.Sh EXIT STATUS
 The
 .Nm
 utility exits 0 if
diff --git a/usr.sbin/user/groupmod.8 b/usr.sbin/user/groupmod.8
index 91492cbd939..ab3cb238430 100644
--- a/usr.sbin/user/groupmod.8
+++ b/usr.sbin/user/groupmod.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: groupmod.8,v 1.16 2009/01/21 16:56:02 sobrado Exp $
+.\" $OpenBSD: groupmod.8,v 1.17 2010/09/03 11:22:36 jmc Exp $
 .\" $NetBSD: groupmod.8,v 1.10 2003/02/14 16:11:37 grant Exp $
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 21 2009 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt GROUPMOD 8
 .Os
 .Sh NAME
@@ -58,7 +58,7 @@ Allows the new group to have a GID which is already in use for another group.
 .It Fl v
 Enables verbose mode - explain the commands as they are executed.
 .El
-.Pp
+.Sh EXIT STATUS
 .Ex -std groupmod
 .Sh SEE ALSO
 .Xr group 5 ,
diff --git a/usr.sbin/user/user.8 b/usr.sbin/user/user.8
index 99fc47a069d..28d516dd8e9 100644
--- a/usr.sbin/user/user.8
+++ b/usr.sbin/user/user.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: user.8,v 1.17 2009/01/21 16:56:02 sobrado Exp $
+.\" $OpenBSD: user.8,v 1.18 2010/09/03 11:22:36 jmc Exp $
 .\" $NetBSD: user.8,v 1.9 2001/06/05 11:31:21 wiz Exp $
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 21 2009 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt USER 8
 .Os
 .Sh NAME
@@ -109,8 +109,6 @@ and
 commands.
 .Pp
 For a full explanation of the options, please see the relevant manual page.
-.Pp
-.Ex -std user
 .Sh FILES
 .Bl -tag -width /etc/usermgmt.conf -compact
 .It Pa /etc/skel/.[A-z]*
@@ -121,6 +119,8 @@ Configuration file for
 .Xr group 8
 and those backend commands
 .El
+.Sh EXIT STATUS
+.Ex -std user
 .Sh SEE ALSO
 .Xr chpass 1 ,
 .Xr group 5 ,
diff --git a/usr.sbin/user/useradd.8 b/usr.sbin/user/useradd.8
index 2c6108c3507..8c136528266 100644
--- a/usr.sbin/user/useradd.8
+++ b/usr.sbin/user/useradd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: useradd.8,v 1.27 2009/01/21 16:56:03 sobrado Exp $
+.\" $OpenBSD: useradd.8,v 1.28 2010/09/03 11:22:36 jmc Exp $
 .\" $NetBSD: useradd.8,v 1.26 2003/02/25 10:36:21 wiz Exp $
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 21 2009 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt USERADD 8
 .Os
 .Sh NAME
@@ -250,14 +250,14 @@ This is run in the background, and,
 at very large sites could take several minutes.
 Until this update is completed, the password file is unavailable for other
 updates and the new information is not available to programs.
-.Pp
-.Ex -std useradd
 .Sh FILES
 .Bl -tag -width /etc/usermgmt.conf -compact
 .It Pa /etc/usermgmt.conf
 .It Pa /etc/skel/*
 .It Pa /etc/login.conf
 .El
+.Sh EXIT STATUS
+.Ex -std useradd
 .Sh SEE ALSO
 .Xr chpass 1 ,
 .Xr group 5 ,
diff --git a/usr.sbin/user/userdel.8 b/usr.sbin/user/userdel.8
index 92219f7ceb2..ad87a06dc80 100644
--- a/usr.sbin/user/userdel.8
+++ b/usr.sbin/user/userdel.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: userdel.8,v 1.13 2009/01/21 16:56:03 sobrado Exp $
+.\" $OpenBSD: userdel.8,v 1.14 2010/09/03 11:22:36 jmc Exp $
 .\" $NetBSD: userdel.8,v 1.24 2003/02/25 10:36:21 wiz Exp $
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 21 2009 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt USERDEL 8
 .Os
 .Sh NAME
@@ -121,12 +121,12 @@ This is run in the background, and,
 at very large sites could take several minutes.
 Until this update is completed, the password file is unavailable for other
 updates and the new information is not available to programs.
-.Pp
-.Ex -std userdel
 .Sh FILES
 .Bl -tag -width /etc/usermgmt.conf -compact
 .It Pa /etc/usermgmt.conf
 .El
+.Sh EXIT STATUS
+.Ex -std userdel
 .Sh SEE ALSO
 .Xr passwd 5 ,
 .Xr usermgmt.conf 5 ,
diff --git a/usr.sbin/user/userinfo.8 b/usr.sbin/user/userinfo.8
index 172af7b9837..ee77514e66e 100644
--- a/usr.sbin/user/userinfo.8
+++ b/usr.sbin/user/userinfo.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: userinfo.8,v 1.12 2008/12/20 09:40:47 jmc Exp $
+.\" $OpenBSD: userinfo.8,v 1.13 2010/09/03 11:22:36 jmc Exp $
 .\" $NetBSD: userinfo.8,v 1.8 2003/02/14 16:11:37 grant Exp $
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: December 20 2008 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt USERINFO 8
 .Os
 .Sh NAME
@@ -63,7 +63,7 @@ name or UID is already in use on the system.
 The
 .Ar user
 argument may be either a user name or a user ID (UID).
-.Pp
+.Sh EXIT STATUS
 The
 .Nm
 utility exits 0 if
diff --git a/usr.sbin/user/usermod.8 b/usr.sbin/user/usermod.8
index 8a210dced9c..dc3e24c6e12 100644
--- a/usr.sbin/user/usermod.8
+++ b/usr.sbin/user/usermod.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: usermod.8,v 1.23 2009/01/21 16:56:03 sobrado Exp $
+.\" $OpenBSD: usermod.8,v 1.24 2010/09/03 11:22:36 jmc Exp $
 .\" $NetBSD: usermod.8,v 1.17 2003/02/14 16:11:37 grant Exp $
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 21 2009 $
+.Dd $Mdocdate: September 3 2010 $
 .Dt USERMOD 8
 .Os
 .Sh NAME
@@ -208,12 +208,12 @@ This is run in the background, and,
 at very large sites could take several minutes.
 Until this update is completed, the password file is unavailable for other
 updates and the new information is not available to programs.
-.Pp
-.Ex -std usermod
 .Sh FILES
 .Bl -tag -width /etc/usermgmt.conf -compact
 .It Pa /etc/usermgmt.conf
 .El
+.Sh EXIT STATUS
+.Ex -std usermod
 .Sh SEE ALSO
 .Xr chpass 1 ,
 .Xr group 5 ,