Hi Glen,

Glen Anderson wrote on Mon, Jul 18, 2011 at 10:10:23PM +0100:

> userinfo -v was removed from userinfo.8 and usage()
> a couple of years ago.

Yes, we did that because the -v option has no effect for userinfo(8)
and people might be confused what it does when it is documented.

> Remove it from user.8

That makes sense, indeed.

> as well as the code.

But this is a bad idea.  It might break scripts for no good reason.
Basically, you are redirecting userinfo -v to usage().

> Sync synopsis of "user add -D ..." with useradd.8

That makes sense, too.

For code patches, please use cvs diff -up, and not just cvs diff -u.

Besides, your patch was mangled and didn't apply.
You replaced tabs by spaces; please don't do that.

> I've also noticed a couple of cases where things are visible in the
> local man pages but not in the online ones - to my untrained eye it
> appears to be related to the Li macro.
> 
> 1) useradd(8) is showing "-r low.." instead of "-r low..high" (Ok in user.8)
> 2) "=uid" is being dropped in the synopsis for the -g options

Hm, i fear nobody will want to dive into man.cgi debugging.
I'd have a brief look, but i don't have access, neither to
the source code of man.cgi nor to the installed manuals it is
using.

While looking at the code, i noticed a few more bugs
and style nits:

 - The -G args lack [,group,...] at a few places.
 - [,group,...] should not be part of .Ar.
 - The .. in low..high should not be part of .Ar.
 - Drop the useless .Li from ..

Any OKs for the patch in the following form?
  Ingo


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.

Reply via email to