- avoid nasty line wrap in SYNOPSIS

- put -G in the right place

2 files changed, 8 insertions, 10 deletions

diff --git a/usr.sbin/user/user.c b/usr.sbin/user/user.c
index 62bd7aa58ae..3327f75ef4a 100644
--- a/usr.sbin/user/user.c
+++ b/usr.sbin/user/user.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: user.c,v 1.79 2011/04/06 11:36:26 miod Exp $ */
+/* $OpenBSD: user.c,v 1.80 2011/04/08 18:13:53 jmc Exp $ */
 /* $NetBSD: user.c,v 1.69 2003/04/14 17:40:07 agc Exp $ */
 
 /*
@@ -1621,9 +1621,9 @@ usermgmt_usage(const char *prog)
 		    "               [-s shell] [-u uid] user\n", prog);
 	} else if (strcmp(prog, "usermod") == 0) {
 		(void) fprintf(stderr, "usage: %s [-mov] "
-		    "[-G secondary-group[,group,...]] [-c comment]\n"
-		    "               [-d home-directory] [-e expiry-time] "
-		    "[-f inactive-time]\n"
+		    "[-c comment] [-d home-directory] [-e expiry-time]\n"
+		    "               [-f inactive-time] "
+		    "[-G secondary-group[,group,...]]\n"
 		    "               [-g gid | name | =uid] [-L login-class] "
 		    "[-l new-login]\n"
 		    "               [-p password] [-s shell] [-u uid] user\n",
diff --git a/usr.sbin/user/usermod.8 b/usr.sbin/user/usermod.8
index dc3e24c6e12..eb36d6dee65 100644
--- a/usr.sbin/user/usermod.8
+++ b/usr.sbin/user/usermod.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: usermod.8,v 1.24 2010/09/03 11:22:36 jmc Exp $
+.\" $OpenBSD: usermod.8,v 1.25 2011/04/08 18:13:54 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: September 3 2010 $
+.Dd $Mdocdate: April 8 2011 $
 .Dt USERMOD 8
 .Os
 .Sh NAME
@@ -41,14 +41,12 @@
 .Nm usermod
 .Bk -words
 .Op Fl mov
-.Op Fl G Ar secondary-group[,group,...]
 .Op Fl c Ar comment
 .Op Fl d Ar home-directory
 .Op Fl e Ar expiry-time
 .Op Fl f Ar inactive-time
-.Oo
-.Fl g Ar gid | name | Li =uid
-.Oc
+.Op Fl G Ar secondary-group[,group,...]
+.Op Fl g Ar gid | name | Li =uid
 .Op Fl L Ar login-class
 .Op Fl l Ar new-login
 .Op Fl p Ar password