use .Cm for fixed string arguments

3 files changed, 19 insertions, 31 deletions

diff --git a/usr.sbin/user/user.8 b/usr.sbin/user/user.8
index 239cbe942d9..4208d623422 100644
--- a/usr.sbin/user/user.8
+++ b/usr.sbin/user/user.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: user.8,v 1.21 2013/07/16 11:13:34 schwarze Exp $
+.\" $OpenBSD: user.8,v 1.22 2015/09/12 15:14:11 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: July 16 2013 $
+.Dd $Mdocdate: September 12 2015 $
 .Dt USER 8
 .Os
 .Sh NAME
@@ -39,20 +39,17 @@
 .Nd manage user login information on the system
 .Sh SYNOPSIS
 .Nm user
-.Bk -words
 .Cm add
 .Fl D
 .Op Fl b Ar base-directory
 .Op Fl e Ar expiry-time
 .Op Fl f Ar inactive-time
-.Op Fl g Ar gid | name | Li =uid
+.Op Fl g Ar gid | name | Cm =uid
 .Op Fl k Ar skel-directory
 .Op Fl L Ar login-class
 .Op Fl r Ar low Ns .. Ns Ar high
 .Op Fl s Ar shell
-.Ek
 .Nm user
-.Bk -words
 .Cm add
 .Op Fl mov
 .Op Fl b Ar base-directory
@@ -61,7 +58,7 @@
 .Op Fl e Ar expiry-time
 .Op Fl f Ar inactive-time
 .Op Fl G Ar secondary-group Ns Op , Ns Ar group , Ns ...
-.Op Fl g Ar gid | name | Li =uid
+.Op Fl g Ar gid | name | Cm =uid
 .Op Fl k Ar skel-directory
 .Op Fl L Ar login-class
 .Op Fl p Ar password
@@ -69,7 +66,6 @@
 .Op Fl s Ar shell
 .Op Fl u Ar uid
 .Ar user
-.Ek
 .Nm user
 .Cm del
 .Fl D
@@ -83,7 +79,6 @@
 .Op Fl e
 .Ar user
 .Nm user
-.Bk -words
 .Cm mod
 .Op Fl mov
 .Op Fl c Ar comment
@@ -91,14 +86,13 @@
 .Op Fl e Ar expiry-time
 .Op Fl f Ar inactive-time
 .Op Fl G Ar secondary-group Ns Op , Ns Ar group , Ns ...
-.Op Fl g Ar gid | name | Li =uid
+.Op Fl g Ar gid | name | Cm =uid
 .Op Fl L Ar login-class
 .Op Fl l Ar new-login
 .Op Fl p Ar password
 .Op Fl s Ar shell
 .Op Fl u Ar uid
 .Ar user
-.Ek
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.sbin/user/useradd.8 b/usr.sbin/user/useradd.8
index 49ab022fafa..ed435e36a26 100644
--- a/usr.sbin/user/useradd.8
+++ b/usr.sbin/user/useradd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: useradd.8,v 1.32 2015/03/13 19:58:41 jmc Exp $
+.\" $OpenBSD: useradd.8,v 1.33 2015/09/12 15:14:11 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: March 13 2015 $
+.Dd $Mdocdate: September 12 2015 $
 .Dt USERADD 8
 .Os
 .Sh NAME
@@ -39,19 +39,16 @@
 .Nd add a user to the system
 .Sh SYNOPSIS
 .Nm useradd
-.Bk -words
 .Fl D
 .Op Fl b Ar base-directory
 .Op Fl e Ar expiry-time
 .Op Fl f Ar inactive-time
-.Op Fl g Ar gid | name | Li =uid
+.Op Fl g Ar gid | name | Cm =uid
 .Op Fl k Ar skel-directory
 .Op Fl L Ar login-class
 .Op Fl r Ar low Ns .. Ns Ar high
 .Op Fl s Ar shell
-.Ek
 .Nm useradd
-.Bk -words
 .Op Fl mov
 .Op Fl b Ar base-directory
 .Op Fl c Ar comment
@@ -59,7 +56,7 @@
 .Op Fl e Ar expiry-time
 .Op Fl f Ar inactive-time
 .Op Fl G Ar secondary-group Ns Op , Ns Ar group , Ns ...
-.Op Fl g Ar gid | name | Li =uid
+.Op Fl g Ar gid | name | Cm =uid
 .Op Fl k Ar skel-directory
 .Op Fl L Ar login-class
 .Op Fl p Ar password
@@ -67,7 +64,6 @@
 .Op Fl s Ar shell
 .Op Fl u Ar uid
 .Ar user
-.Ek
 .Sh DESCRIPTION
 The
 .Nm useradd
@@ -134,7 +130,7 @@ Sets the time at which passwords of new accounts will expire.
 Also see the
 .Fl e
 option above.
-.It Fl g Ar gid | name | Li =uid
+.It Fl g Ar gid | name | Cm =uid
 Sets the default group for new users.
 .It Fl k Ar skel-directory
 Sets the skeleton directory in which to find files with
@@ -193,10 +189,10 @@ option above.
 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
+.It Fl g Ar gid | name | Cm =uid
 Gives the group name or identifier to be used for the new user's primary group.
-If this is
-.Ql =uid ,
+If this is the special string
+.Cm =uid ,
 then a UID and GID will be picked which are both unique
 and the same, and a line added to
 .Pa /etc/group
diff --git a/usr.sbin/user/usermod.8 b/usr.sbin/user/usermod.8
index 4ccdb9c6eb8..73f8fb0213d 100644
--- a/usr.sbin/user/usermod.8
+++ b/usr.sbin/user/usermod.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: usermod.8,v 1.31 2015/03/13 19:58:41 jmc Exp $
+.\" $OpenBSD: usermod.8,v 1.32 2015/09/12 15:14:11 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: March 13 2015 $
+.Dd $Mdocdate: September 12 2015 $
 .Dt USERMOD 8
 .Os
 .Sh NAME
@@ -39,14 +39,13 @@
 .Nd modify user login information
 .Sh SYNOPSIS
 .Nm usermod
-.Bk -words
 .Op Fl moUvZ
 .Op Fl c Ar comment
 .Op Fl d Ar home-directory
 .Op Fl e Ar expiry-time
 .Op Fl f Ar inactive-time
 .Op Fl G Ar secondary-group Ns Op , Ns Ar group , Ns ...
-.Op Fl g Ar gid | name | Li =uid
+.Op Fl g Ar gid | name | Cm =uid
 .Op Fl L Ar login-class
 .Op Fl l Ar new-login
 .Op Fl p Ar password
@@ -54,7 +53,6 @@
 .Op Fl s Ar shell
 .Op Fl u Ar uid
 .Ar user
-.Ek
 .Sh DESCRIPTION
 The
 .Nm
@@ -110,11 +108,11 @@ and
 .Fl S
 are mutually exclusive.
 .It Xo
-.Fl g Ar gid | name | Li =uid
+.Fl g Ar gid | name | Cm =uid
 .Xc
 Gives the group name or identifier to be used for the user's primary group.
-If this is
-.Ql =uid ,
+If this is the special string
+.Cm =uid ,
 then a UID and GID will be picked which are both unique
 and the same, and a line added to
 .Pa /etc/group