paragraphs and sentences start with uppercase letters; synchronize

the synopsis and usage of user(8) related commands; sort the options
list in the DESCRIPTION section of the manual pages; spacing.

ok jmc@

9 files changed, 127 insertions, 119 deletions

diff --git a/usr.sbin/user/groupadd.8 b/usr.sbin/user/groupadd.8
index f01d458100f..e9656f5d4b4 100644
--- a/usr.sbin/user/groupadd.8
+++ b/usr.sbin/user/groupadd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: groupadd.8,v 1.13 2009/01/19 09:46:59 sobrado Exp $
+.\" $OpenBSD: groupadd.8,v 1.14 2009/01/21 16:56:02 sobrado 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 19 2009 $
+.Dd $Mdocdate: January 21 2009 $
 .Dt GROUPADD 8
 .Os
 .Sh NAME
@@ -49,11 +49,11 @@ utility adds a group to the system.
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl g Ar gid
-gives the numeric group identifier to be used for the new group.
+Gives the numeric group identifier to be used for the new group.
 .It Fl o
-allow the new group to have a GID which is already in use for another group.
+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.
+Enables verbose mode - explain the commands as they are executed.
 .El
 .Pp
 .Ex -std groupadd
diff --git a/usr.sbin/user/groupdel.8 b/usr.sbin/user/groupdel.8
index abcf59b12e9..2fa588148de 100644
--- a/usr.sbin/user/groupdel.8
+++ b/usr.sbin/user/groupdel.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: groupdel.8,v 1.13 2009/01/19 09:46:59 sobrado Exp $
+.\" $OpenBSD: groupdel.8,v 1.14 2009/01/21 16:56:02 sobrado 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 19 2009 $
+.Dd $Mdocdate: January 21 2009 $
 .Dt GROUPDEL 8
 .Os
 .Sh NAME
@@ -48,7 +48,7 @@ utility removes a group from the system.
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl v
-enables verbose mode - explain the commands as they are executed.
+Enables verbose mode - explain the commands as they are executed.
 .El
 .Pp
 .Ex -std groupdel
diff --git a/usr.sbin/user/groupmod.8 b/usr.sbin/user/groupmod.8
index 87ddb78a54d..91492cbd939 100644
--- a/usr.sbin/user/groupmod.8
+++ b/usr.sbin/user/groupmod.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: groupmod.8,v 1.15 2009/01/19 09:46:59 sobrado Exp $
+.\" $OpenBSD: groupmod.8,v 1.16 2009/01/21 16:56:02 sobrado 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 19 2009 $
+.Dd $Mdocdate: January 21 2009 $
 .Dt GROUPMOD 8
 .Os
 .Sh NAME
@@ -50,13 +50,13 @@ utility modifies an existing group.
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl g Ar gid
-gives the numeric group identifier to be used for the new group.
+Gives the numeric group identifier to be used for the new group.
 .It Fl n Ar newname
-gives the new name which the group shall have.
+Gives the new name which the group shall have.
 .It Fl o
-allow the new group to have a GID which is already in use for another group.
+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.
+Enables verbose mode - explain the commands as they are executed.
 .El
 .Pp
 .Ex -std groupmod
diff --git a/usr.sbin/user/user.8 b/usr.sbin/user/user.8
index 8bbfce11612..99fc47a069d 100644
--- a/usr.sbin/user/user.8
+++ b/usr.sbin/user/user.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: user.8,v 1.16 2009/01/19 09:46:59 sobrado Exp $
+.\" $OpenBSD: user.8,v 1.17 2009/01/21 16:56:02 sobrado 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 19 2009 $
+.Dd $Mdocdate: January 21 2009 $
 .Dt USER 8
 .Os
 .Sh NAME
@@ -42,7 +42,7 @@
 .Bk -words
 .Cm add
 .Fl D
-.Op Fl b Ar base-dir
+.Op Fl b Ar base-directory
 .Op Fl e Ar expiry-time
 .Op Fl f Ar inactive-time
 .Op Fl g Ar gid/name/=uid
@@ -53,14 +53,14 @@
 .Bk -words
 .Cm add
 .Op Fl mov
-.Op Fl b Ar base-dir
+.Op Fl b Ar base-directory
 .Op Fl c Ar comment
-.Op Fl d Ar home-dir
+.Op Fl d Ar home-directory
 .Op Fl e Ar expiry-time
 .Op Fl f Ar inactive-time
 .Op Fl G Ar secondary-group
 .Op Fl g Ar gid/name/=uid
-.Op Fl k Ar skel-dir
+.Op Fl k Ar skel-directory
 .Op Fl L Ar login-class
 .Op Fl p Ar password
 .Op Fl r Ar low..high
@@ -85,7 +85,7 @@
 .Cm mod
 .Op Fl mov
 .Op Fl c Ar comment
-.Op Fl d Ar home-dir
+.Op Fl d Ar home-directory
 .Op Fl e Ar expiry-time
 .Op Fl f Ar inactive-time
 .Op Fl G Ar secondary-group
diff --git a/usr.sbin/user/user.c b/usr.sbin/user/user.c
index c0748ef7bba..35b0f3fb22e 100644
--- a/usr.sbin/user/user.c
+++ b/usr.sbin/user/user.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: user.c,v 1.75 2008/12/20 09:40:47 jmc Exp $ */
+/* $OpenBSD: user.c,v 1.76 2009/01/21 16:56:02 sobrado Exp $ */
 /* $NetBSD: user.c,v 1.69 2003/04/14 17:40:07 agc Exp $ */
 
 /*
@@ -1598,24 +1598,32 @@ void
 usermgmt_usage(const char *prog)
 {
 	if (strcmp(prog, "useradd") == 0) {
-		(void) fprintf(stderr, "usage: %s -D [-b basedir] [-e expiry] "
-		    "[-f changetime] [-g group]\n\t\t[-k skeletondir] "
-		    "[-r low..high] [-s shell] [-L class]\n", prog);
-		(void) fprintf(stderr, "usage: %s [-mov] [-G group[,group,...]]"
-		    " [-b basedir] [-c comment]\n\t\t"
-		    "[-d homedir] [-e expiry] [-f changetime] [-g group]\n\t\t"
-		    "[-k skeletondir] [-p password] "
-		    "[-r lowuid..highuid]\n\t\t[-s shell] [-u uid] [-L class] "
-		    "user\n", prog);
+		(void) fprintf(stderr, "usage: %s -D [-b base-directory] "
+		    "[-e expiry-time] [-f inactive-time]\n"
+		    "               [-g gid | name | =uid] [-k skel-directory] "
+		    "[-L login-class]\n"
+		    "               [-r low..high] [-s shell]\n", prog);
+		(void) fprintf(stderr, "       %s [-mov] [-b base-directory] "
+		    "[-c comment] [-d home-directory]\n"
+		    "               [-e expiry-time] [-f inactive-time]\n"
+		    "               [-G secondary-group[,group,...]] "
+		    "[-g gid | name | =uid]\n"
+		    "               [-k skel-directory] [-L login-class] "
+		    "[-p password] [-r low..high]\n"
+		    "               [-s shell] [-u uid] user\n", prog);
 	} else if (strcmp(prog, "usermod") == 0) {
-		(void) fprintf(stderr, "usage: %s [-mov] [-G group[,group,...]]"
-		    " [-c comment] [-d homedir]\n\t\t"
-		    "[-e expire] [-f changetime] [-g group] [-l newname]\n\t\t"
-		    "[-p password] [-s shell] [-u uid] [-L class] user\n",
+		(void) fprintf(stderr, "usage: %s [-mov] "
+		    "[-G secondary-group[,group,...]] [-c comment]\n"
+		    "               [-d home-directory] [-e expiry-time] "
+		    "[-f inactive-time]\n"
+		    "               [-g gid | name | =uid] [-L login-class] "
+		    "[-l new-login]\n"
+		    "               [-p password] [-s shell] [-u uid] user\n",
 		    prog);
 	} else if (strcmp(prog, "userdel") == 0) {
-		(void) fprintf(stderr, "usage: %s -D [-p preserve]\n", prog);
-		(void) fprintf(stderr, "usage: %s [-prv] user\n", prog);
+		(void) fprintf(stderr, "usage: %s -D [-p preserve-value]\n",
+		    prog);
+		(void) fprintf(stderr, "       %s [-prv] user\n", prog);
 #ifdef EXTENSIONS
 	} else if (strcmp(prog, "userinfo") == 0) {
 		(void) fprintf(stderr, "usage: %s [-e] user\n", prog);
@@ -1629,9 +1637,9 @@ usermgmt_usage(const char *prog)
 		(void) fprintf(stderr, "usage: %s [-ov] [-g gid] [-n newname] "
 		    "group\n", prog);
 	} else if (strcmp(prog, "user") == 0 || strcmp(prog, "group") == 0) {
-		(void) fprintf(stderr, "usage: %s [ add | del | mod "
+		(void) fprintf(stderr, "usage: %s [add | del | mod"
 #ifdef EXTENSIONS
-		"| info "
+		" | info"
 #endif
 		"] ...\n",
 		    prog);
diff --git a/usr.sbin/user/useradd.8 b/usr.sbin/user/useradd.8
index 39b65c022d6..2c6108c3507 100644
--- a/usr.sbin/user/useradd.8
+++ b/usr.sbin/user/useradd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: useradd.8,v 1.26 2009/01/19 09:46:59 sobrado Exp $
+.\" $OpenBSD: useradd.8,v 1.27 2009/01/21 16:56:03 sobrado 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 19 2009 $
+.Dd $Mdocdate: January 21 2009 $
 .Dt USERADD 8
 .Os
 .Sh NAME
@@ -41,12 +41,12 @@
 .Nm useradd
 .Bk -words
 .Fl D
-.Op Fl b Ar base-dir
+.Op Fl b Ar base-directory
 .Op Fl e Ar expiry-time
 .Op Fl f Ar inactive-time
 .Oo
 .Fl g Ar gid | name | Li =uid Oc
-.Op Fl k Ar skel-dir
+.Op Fl k Ar skel-directory
 .Op Fl L Ar login-class
 .Oo
 .Fl r Ar low Ns Li .. Ns Ar high
@@ -56,15 +56,15 @@
 .Nm useradd
 .Bk -words
 .Op Fl mov
-.Op Fl b Ar base-dir
+.Op Fl b Ar base-directory
 .Op Fl c Ar comment
-.Op Fl d Ar home-dir
+.Op Fl d Ar home-directory
 .Op Fl e Ar expiry-time
 .Op Fl f Ar inactive-time
 .Op Fl G Ar secondary-group[,group,...]
 .Oo
 .Fl g Ar gid | name | Li =uid Oc
-.Op Fl k Ar skel-dir
+.Op Fl k Ar skel-directory
 .Op Fl L Ar login-class
 .Op Fl p Ar password
 .Oo
@@ -81,7 +81,7 @@ utility adds a user to the system, creating and
 populating a home directory if necessary.
 Any skeleton files will be provided
 for the new user if they exist in the
-.Ar skel-dir
+.Ar skel-directory
 directory (see the
 .Fl k
 option).
@@ -105,8 +105,16 @@ sets and displays the defaults for the
 .Nm
 utility.
 .Bl -tag -width Ds
+.It Fl b Ar base-directory
+Sets the base directory.
+This is the directory to which the user directory is added,
+which will be created if the
+.Fl m
+option is specified and no
+.Fl d
+option is specified.
 .It Fl D
-without any further options,
+Without any further options,
 .Fl D
 will show the current defaults which
 will be used by the
@@ -119,16 +127,8 @@ will set the default to be the new value.
 See
 .Xr usermgmt.conf 5
 for more information.
-.It Fl b Ar base-dir
-sets the base directory.
-This is the directory to which the user directory is added,
-which will be created if the
-.Fl m
-option is specified and no
-.Fl d
-option is specified.
 .It Fl e Ar expiry-time
-sets the default time at which new accounts will expire.
+Sets the default time at which new accounts will expire.
 It should be entered in the form
 .Dq month day year ,
 where month is the month name (the first three characters are
@@ -136,28 +136,28 @@ sufficient), day is the day of the month, and year is the year.
 Time in seconds since the Epoch (UTC) is also valid.
 A value of 0 can be used to disable this feature.
 .It Fl f Ar inactive-time
-sets the time at which passwords of new accounts will expire.
+Sets the time at which passwords of new accounts will expire.
 Also see the
 .Fl e
 option above.
-.It Fl g Ar gid | groupname | Li =uid
-sets the default group for new users.
-.It Fl k Ar skel-dir
-sets the skeleton directory in which to find files with
+.It Fl g Ar gid | name | Li =uid
+Sets the default group for new users.
+.It Fl k Ar skel-directory
+Sets the skeleton directory in which to find files with
 which to populate new users' home directories.
 .It Fl L Ar login-class
-sets the default login class for new users.
+Sets the default login class for new users.
 See
 .Xr login.conf 5
 for more information on user login classes.
 .It Xo
 .Fl r Ar low Ns Li .. Ns Ar high
 .Xc
-sets the low and high bounds of UID ranges for new users.
+Sets the low and high bounds of UID ranges for new users.
 A new user can only be created if there are UIDs which can be assigned
 from one of the free ranges.
 .It Fl s Ar shell
-sets the default login shell for new users.
+Sets the default login shell for new users.
 .El
 .Pp
 In the second form of the command,
@@ -166,21 +166,21 @@ after setting any defaults, and then reading values from
 the following command line options are processed:
 .Bl -tag -width Ds
 .It Fl b Ar base-directory
-is the base directory name, in which the user's new home
+Sets the base directory name, in which the user's new home
 directory will be created, should the
 .Fl m
 option be specified.
 .It Fl c Ar comment
-is the comment field (also, for historical reasons known as the
+Sets the comment field (also, for historical reasons known as the
 GECOS field) which will be added for the user, and typically will include
 the user's full name, and, perhaps, contact information for the user.
 .It Fl d Ar home-directory
-is the home directory which will be created and populated for the user,
+Sets the home directory which will be created and populated for the user,
 should the
 .Fl m
 option be specified.
 .It Fl e Ar expiry-time
-sets the time at which the user account will expire.
+Sets the time at which the user account will expire.
 It should be entered in the form
 .Dq month day year ,
 where month is the month name (the first three characters are
@@ -191,24 +191,24 @@ See
 .Xr passwd 5
 for more details.
 .It Fl f Ar inactive-time
-sets the time at which the current password will expire.
+Sets the time at which the current password will expire.
 Also see the
 .Fl e
 option above.
 .It Fl G Ar secondary-group[,group,...]
-are the secondary groups to which the user will be added in the
+Sets the secondary groups to which the user will be added in the
 .Pa /etc/group
 file.
 .It Fl g Ar gid | name | Li =uid
-gives the group name or identifier to be used for the new user's primary group.
+Gives the group name or identifier to be used for the new user's primary group.
 If this is
 .Ql =uid ,
 then a UID and GID will be picked which are both unique
 and the same, and a line added to
 .Pa /etc/group
 to describe the new group.
-.It Fl k Ar skeleton directory
-gives the skeleton directory in which to find files
+.It Fl k Ar skel-directory
+Gives the skeleton directory in which to find files
 with which to populate the new user's home directory.
 .It Fl L Ar login-class
 This option sets the login class for the user being created.
@@ -216,11 +216,11 @@ See
 .Xr login.conf 5
 for more information on user login classes.
 .It Fl m
-create a new home directory for the new user.
+Create a new home directory for the new user.
 .It Fl o
-allow the new user to have a UID which is already in use for another user.
+Allow the new user to have a UID which is already in use for another user.
 .It Fl p Ar password
-specifies an already-encrypted password for the new user.
+Specifies an already-encrypted password for the new user.
 This password can then be changed by using the
 .Xr chpass 1
 utility.
@@ -228,9 +228,9 @@ If this option is not specified, and no default exists in
 .Pa /etc/usermgmt.conf ,
 the account will be disabled by default.
 .It Fl s Ar shell
-specifies the login shell for the new user.
+Specifies the login shell for the new user.
 .It Fl u Ar uid
-specifies a UID for the new user.
+Specifies a UID for the new user.
 Boundaries for this value can be preset for all users
 by using the
 .Ar range
@@ -238,7 +238,7 @@ field in the
 .Pa /etc/usermgmt.conf
 file.
 .It Fl v
-enables verbose mode - explain the commands as they are executed.
+Enables verbose mode - explain the commands as they are executed.
 .El
 .Pp
 Once the information has been verified,
diff --git a/usr.sbin/user/userdel.8 b/usr.sbin/user/userdel.8
index 51599edb702..92219f7ceb2 100644
--- a/usr.sbin/user/userdel.8
+++ b/usr.sbin/user/userdel.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: userdel.8,v 1.12 2009/01/19 09:46:59 sobrado Exp $
+.\" $OpenBSD: userdel.8,v 1.13 2009/01/21 16:56:03 sobrado 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 19 2009 $
+.Dd $Mdocdate: January 21 2009 $
 .Dt USERDEL 8
 .Os
 .Sh NAME
@@ -62,7 +62,7 @@ option) sets and displays the defaults for the
 utility.
 .Bl -tag -width Ds
 .It Fl D
-without any further options,
+Without any further options,
 .Fl D
 will show the current defaults which will be used by the
 .Nm
@@ -72,7 +72,7 @@ of the command,
 .Fl D
 will set the default to be the new value.
 .It Fl p Ar preserve-value
-sets the preservation value.
+Sets the preservation value.
 If this value is one of
 .Ql true ,
 .Ql yes ,
@@ -85,7 +85,7 @@ after setting any defaults, and then reading values from
 the following command line options are processed:
 .Bl -tag -width Ds
 .It Fl p
-preserve the user information in the password file,
+Preserve the user information in the password file,
 but do not allow the user to login, by switching the
 password to an
 .Dq impossible
@@ -106,10 +106,10 @@ If the field has any of the values
 .Ql yes ,
 or a non-zero number, then user information preservation will take place.
 .It Fl r
-remove the user's home directory, any subdirectories,
+Remove the user's home directory, any subdirectories,
 and any files and other entries in them.
 .It Fl v
-perform any actions in a verbose manner.
+Perform any actions in a verbose manner.
 .El
 .Pp
 Once the information has been verified,
diff --git a/usr.sbin/user/usermgmt.conf.5 b/usr.sbin/user/usermgmt.conf.5
index 31f3ed5d1fd..6a513f13ba3 100644
--- a/usr.sbin/user/usermgmt.conf.5
+++ b/usr.sbin/user/usermgmt.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: usermgmt.conf.5,v 1.9 2007/05/31 19:20:30 jmc Exp $
+.\" $OpenBSD: usermgmt.conf.5,v 1.10 2009/01/21 16:56:03 sobrado Exp $
 .\" $NetBSD: usermgmt.conf.5,v 1.3 2002/10/02 13:49:11 grant Exp $
 .\"
 .\" Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 21 2009 $
 .Dt USERMGMT.CONF 5
 .Os
 .\" turn off hyphenation
@@ -54,18 +54,18 @@ option to
 .Xr useradd 8 .
 .Bl -tag -width preserveX
 .It Ic base_dir
-sets the base directory name, in which new users' home directories
+Sets the base directory name, in which new users' home directories
 are created when using the
 .Fl m
 option to
 .Xr useradd 8 .
 .It Ic class
-sets the default login class for new users.
+Sets the default login class for new users.
 See
 .Xr login.conf 5
 for more information on user login classes.
 .It Ic expire
-sets the default time at which the new accounts expire.
+Sets the default time at which the new accounts expire.
 Both the
 .Ar expire
 and
@@ -77,7 +77,7 @@ sufficient), day is the day of the month, and year is the year.
 Time in seconds since the Epoch (UTC) is also valid.
 A value of 0 can be used to disable this feature.
 .It Ic group
-sets the default primary group for new users.
+Sets the default primary group for new users.
 If this is
 .Ql =uid ,
 then a UID and GID will be picked which are both unique
@@ -90,13 +90,13 @@ It has the format:
 .Ar gid | name | Li =uid
 .Ed
 .It Ic inactive
-sets the default time at which the passwords of new accounts expire.
+Sets the default time at which the passwords of new accounts expire.
 A value of 0 can be used to disable this feature.
 Also see the
 .Ar expire
 field.
 .It Ic password
-specifies an already-encrypted default password.
+Specifies an already-encrypted default password.
 .It Ic preserve
 If this value is one of
 .Ql true ,
@@ -105,7 +105,7 @@ or a non-zero number, then the user login information will be
 preserved when removing a user with
 .Xr userdel 8 .
 .It Ic range
-specifies the UID boundaries for new users.
+Specifies the UID boundaries for new users.
 If unspecified, the default is
 .Dq 1000..60000 .
 It has the format:
@@ -113,9 +113,9 @@ It has the format:
 .Ic range Ar starting-uid Ns Li .. Ns Ar ending-uid
 .Ed
 .It Ic shell
-sets the default login shell for new users.
+Sets the default login shell for new users.
 .It Ic skel_dir
-sets the default skeleton directory in which to find files
+Sets the default skeleton directory in which to find files
 with which to populate the new user's home directory.
 .El
 .Sh FILES
diff --git a/usr.sbin/user/usermod.8 b/usr.sbin/user/usermod.8
index 77eb7d27b84..8a210dced9c 100644
--- a/usr.sbin/user/usermod.8
+++ b/usr.sbin/user/usermod.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: usermod.8,v 1.22 2009/01/19 09:46:59 sobrado Exp $
+.\" $OpenBSD: usermod.8,v 1.23 2009/01/21 16:56:03 sobrado 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 19 2009 $
+.Dd $Mdocdate: January 21 2009 $
 .Dt USERMOD 8
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@
 .Op Fl mov
 .Op Fl G Ar secondary-group[,group,...]
 .Op Fl c Ar comment
-.Op Fl d Ar home-dir
+.Op Fl d Ar home-directory
 .Op Fl e Ar expiry-time
 .Op Fl f Ar inactive-time
 .Oo
@@ -70,23 +70,19 @@ After setting any defaults, and then reading values from
 .Pa /etc/usermgmt.conf ,
 the following command line options are processed:
 .Bl -tag -width Ds
-.It Fl G Ar secondary-group[,group,...]
-are the secondary groups the user will be a member of in the
-.Pa /etc/group
-file.
 .It Fl c Ar comment
-is the comment field (also, for historical reasons known as the
+Sets the comment field (also, for historical reasons known as the
 GECOS field) which will be added for the user, and typically will include
 the user's full name, and, perhaps, contact information for the user.
 .It Fl d Ar home-directory
-sets the home directory to
+Sets the home directory to
 .Ar home-directory
 without populating it; if the
 .Fl m
 option is specified, tries to move the old home directory to
 .Ar home-directory .
 .It Fl e Ar expiry-time
-sets the time at which the account expires.
+Sets the time at which the account expires.
 It should be entered in the form
 .Dq month day year ,
 where month is the month name (the first three characters are
@@ -102,14 +98,18 @@ See
 .Xr usermgmt.conf 5
 for more details.
 .It Fl f Ar inactive-time
-sets the time at which the password expires.
+Sets the time at which the password expires.
 See the
 .Fl e
 option.
+.It Fl G Ar secondary-group[,group,...]
+Sets the secondary groups the user will be a member of in the
+.Pa /etc/group
+file.
 .It Xo
 .Fl g Ar gid | name | Li =uid
 .Xc
-gives the group name or identifier to be used for the user's primary group.
+Gives the group name or identifier to be used for the user's primary group.
 If this is
 .Ql =uid ,
 then a UID and GID will be picked which are both unique
@@ -126,7 +126,7 @@ See
 .Xr usermgmt.conf 5
 for more details.
 .It Fl L Ar login-class
-this option sets the login class for the user being created.
+This option sets the login class for the user being created.
 See
 .Xr login.conf 5
 for more information on user login classes.
@@ -137,15 +137,15 @@ field in the
 file.
 .Xr usermgmt.conf 5
 for more details.
-.It Fl l Ar new-user
-gives the new user name.
+.It Fl l Ar new-login
+Gives the new user name.
 It must consist of alphanumeric characters, or the characters
 .Ql \&. ,
 .Ql \&-
 or
 .Ql \&_ .
 .It Fl m
-moves the home directory from its old position to the new one.
+Moves the home directory from its old position to the new one.
 If
 .Fl d
 is not specified, the
@@ -158,9 +158,9 @@ and
 .Fl l
 is needed.
 .It Fl o
-allows duplicate UIDs to be given.
+Allows duplicate UIDs to be given.
 .It Fl p Ar password
-specifies an already-encrypted password for the user.
+Specifies an already-encrypted password for the user.
 This password can then be changed by using the
 .Xr chpass 1
 utility.
@@ -174,7 +174,7 @@ See
 .Xr usermgmt.conf 5
 for more details.
 .It Fl s Ar shell
-specifies the login shell for the user.
+Specifies the login shell for the user.
 This value can be preset for all users
 by using the
 .Ar shell
@@ -185,7 +185,7 @@ See
 .Xr usermgmt.conf 5
 for more details.
 .It Fl u Ar uid
-specifies a new UID for the user.
+Specifies a new UID for the user.
 Boundaries for this value can be preset for all users
 by using the
 .Ar range
@@ -196,7 +196,7 @@ See
 .Xr usermgmt.conf 5
 for more details.
 .It Fl v
-enables verbose mode - explain the commands as they are executed.
+Enables verbose mode - explain the commands as they are executed.
 .El
 .Pp
 Once the information has been verified,