On Tue, Jul 19, 2011 at 12:42:47AM +0200, Ingo Schwarze wrote: > > Any OKs for the patch in the following form? > Ingo >
go ahead. jmc > > Index: user.8 > =================================================================== > RCS file: /cvs/src/usr.sbin/user/user.8,v > retrieving revision 1.19 > diff -u -p -r1.19 user.8 > --- user.8 16 Apr 2011 07:26:12 -0000 1.19 > +++ user.8 18 Jul 2011 22:36:50 -0000 > @@ -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 > Index: useradd.8 > =================================================================== > RCS file: /cvs/src/usr.sbin/user/useradd.8,v > retrieving revision 1.29 > diff -u -p -r1.29 useradd.8 > --- useradd.8 17 Apr 2011 20:32:33 -0000 1.29 > +++ useradd.8 18 Jul 2011 22:36:50 -0000 > @@ -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 passw > 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. > Index: usermod.8 > =================================================================== > RCS file: /cvs/src/usr.sbin/user/usermod.8,v > retrieving revision 1.25 > diff -u -p -r1.25 usermod.8 > --- usermod.8 8 Apr 2011 18:13:54 -0000 1.25 > +++ usermod.8 18 Jul 2011 22:36:50 -0000 > @@ -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 expi > 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.
