Sync user(8) SYNOPSIS to useradd(8) and userinfo(8)

as suggested by Glen Anderson <g dot s dot anderson at gmail dot com>;
while here, add a few missing "[,group,...]",
do not lump punctuation into .Ar, and drop useless .Li from "..".
OK jmc@

3 files changed, 20 insertions, 18 deletions

diff --git a/usr.sbin/user/user.8 b/usr.sbin/user/user.8
index 0aee8f184fd..f81db4623b9 100644
--- a/usr.sbin/user/user.8
+++ b/usr.sbin/user/user.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: user.8,v 1.19 2011/04/16 07:26:12 sobrado Exp $
+.\" $OpenBSD: user.8,v 1.20 2011/07/18 23:01:10 schwarze 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: April 16 2011 $
+.Dd $Mdocdate: July 18 2011 $
 .Dt USER 8
 .Os
 .Sh NAME
@@ -46,8 +46,10 @@
 .Op Fl e Ar expiry-time
 .Op Fl f Ar inactive-time
 .Op Fl g Ar gid | name | Li =uid
+.Op Fl k Ar skel-directory
 .Op Fl L Ar login-class
-.Op Fl r Ar low..high
+.Op Fl r Ar low Ns .. Ns Ar high
+.Op Fl s Ar shell
 .Ek
 .Nm user
 .Bk -words
@@ -58,12 +60,12 @@
 .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 secondary-group Ns Op , Ns Ar group , Ns ...
 .Op Fl g Ar gid | name | Li =uid
 .Op Fl k Ar skel-directory
 .Op Fl L Ar login-class
 .Op Fl p Ar password
-.Op Fl r Ar low..high
+.Op Fl r Ar low Ns .. Ns Ar high
 .Op Fl s Ar shell
 .Op Fl u Ar uid
 .Ar user
@@ -78,7 +80,7 @@
 .Ar user
 .Nm user
 .Cm info
-.Op Fl ev
+.Op Fl e
 .Ar user
 .Nm user
 .Bk -words
@@ -88,7 +90,7 @@
 .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 secondary-group Ns Op , Ns Ar group , Ns ...
 .Op Fl g Ar gid | name | Li =uid
 .Op Fl L Ar login-class
 .Op Fl l Ar new-login
diff --git a/usr.sbin/user/useradd.8 b/usr.sbin/user/useradd.8
index 5e36d839231..4ec3206fa38 100644
--- a/usr.sbin/user/useradd.8
+++ b/usr.sbin/user/useradd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: useradd.8,v 1.29 2011/04/17 20:32:33 sobrado Exp $
+.\" $OpenBSD: useradd.8,v 1.30 2011/07/18 23:01:10 schwarze 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: April 17 2011 $
+.Dd $Mdocdate: July 18 2011 $
 .Dt USERADD 8
 .Os
 .Sh NAME
@@ -47,7 +47,7 @@
 .Op Fl g Ar gid | name | Li =uid
 .Op Fl k Ar skel-directory
 .Op Fl L Ar login-class
-.Op Fl r Ar low Ns Li .. Ns Ar high
+.Op Fl r Ar low Ns .. Ns Ar high
 .Op Fl s Ar shell
 .Ek
 .Nm useradd
@@ -58,12 +58,12 @@
 .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,...]
+.Op Fl G Ar secondary-group Ns Op , Ns Ar group , Ns ...
 .Op Fl g Ar gid | name | Li =uid
 .Op Fl k Ar skel-directory
 .Op Fl L Ar login-class
 .Op Fl p Ar password
-.Op Fl r Ar low Ns Li .. Ns Ar high
+.Op Fl r Ar low Ns .. Ns Ar high
 .Op Fl s Ar shell
 .Op Fl u Ar uid
 .Ar user
@@ -145,7 +145,7 @@ See
 .Xr login.conf 5
 for more information on user login classes.
 .It Xo
-.Fl r Ar low Ns Li .. Ns Ar high
+.Fl r Ar low Ns .. Ns Ar high
 .Xc
 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
@@ -189,7 +189,7 @@ Sets the time at which the current password will expire.
 Also see the
 .Fl e
 option above.
-.It Fl G Ar secondary-group[,group,...]
+.It Fl G Ar secondary-group Ns Op , Ns Ar group , Ns ...
 Sets the secondary groups to which the user will be added in the
 .Pa /etc/group
 file.
diff --git a/usr.sbin/user/usermod.8 b/usr.sbin/user/usermod.8
index eb36d6dee65..229b073be42 100644
--- a/usr.sbin/user/usermod.8
+++ b/usr.sbin/user/usermod.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: usermod.8,v 1.25 2011/04/08 18:13:54 jmc Exp $
+.\" $OpenBSD: usermod.8,v 1.26 2011/07/18 23:01:10 schwarze 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: April 8 2011 $
+.Dd $Mdocdate: July 18 2011 $
 .Dt USERMOD 8
 .Os
 .Sh NAME
@@ -45,7 +45,7 @@
 .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,...]
+.Op Fl G Ar secondary-group Ns Op , Ns Ar group , Ns ...
 .Op Fl g Ar gid | name | Li =uid
 .Op Fl L Ar login-class
 .Op Fl l Ar new-login
@@ -100,7 +100,7 @@ Sets the time at which the password expires.
 See the
 .Fl e
 option.
-.It Fl G Ar secondary-group[,group,...]
+.It Fl G Ar secondary-group Ns Op , Ns Ar group , Ns ...
 Sets the secondary groups the user will be a member of in the
 .Pa /etc/group
 file.