MFH

[pw-darwin.git] / chpass / chpass.1

diff --git a/chpass/chpass.1 b/chpass/chpass.1
index d059d71cda6d07490cd072eb74469e6acd053f9e..a97531e9e69316d6085180a87684cfb13c8a7def 100644 (file)
--- a/chpass/chpass.1
+++ b/chpass/chpass.1
@@ -9,10 +9,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"    This product includes software developed by the University of
-.\"    California, Berkeley and its contributors.
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
@@ -50,7 +46,6 @@
 .Op Fl e Ar expiretime
 .Op Fl s Ar newshell
 .Op user
-.Pp
 .Nm
 .Op Fl oly
 .Op Fl a Ar list
@@ -163,12 +158,13 @@ Both of these fields should be unique across the system (and often
 across a group of systems) as they control file access.
 .Pp
 While it is possible to have multiple entries with identical login names
-and/or identical user id's, it is usually a mistake to do so.  Routines
+and/or identical user id's, it is usually a mistake to do so.
+Routines
 that manipulate these files will often return only one of the multiple
 entries, and that one by random selection.
 .Pp
 The
-.Ar group
+.Ar gid
 field is the group that the user will be placed in at login.
 Since
 .Bx
@@ -215,7 +211,7 @@ and
 numbers and finally
 .Ar other information
 which is a single comma delimited string to represent any additional
-gcos fields (typically used for site specific user information).
+gecos fields (typically used for site specific user information).
 Note that
 .Xr finger 1
 will display the office location and office phone together under the
@@ -321,7 +317,6 @@ password -- see below) will be silently discarded.
 .Pp
 Exception: the super-user on the NIS master server is permitted to
 change any field.
-.Pp
 .It
 .Em "Password authentication is required" .
 The
@@ -437,7 +432,6 @@ option can be used in conjunction with the
 .Fl d
 option, in which case the user-specified hostname will override
 the default.
-.Pp
 .It Fl o
 Force the use of RPC-based updates when communicating with
 .Xr rpc.yppasswdd 8
@@ -447,7 +441,8 @@ When invoked by the super-user on the NIS master server,
 allows unrestricted changes to the NIS passwd maps using dedicated,
 non-RPC-based mechanism (in this case, a
 .Ux
-domain socket). The
+domain socket).
+The
 .Fl o
 flag can be used to force
 .Nm
@@ -473,18 +468,18 @@ the list of approved shells
 .Xr getusershell 3 ,
 .Xr login.conf 5 ,
 .Xr passwd 5 ,
+.Xr pw 8 ,
 .Xr pwd_mkdb 8 ,
 .Xr vipw 8
 .Rs
 .%A Robert Morris
-and
 .%A Ken Thompson
 .%T "UNIX Password security"
 .Re
-.Sh BUGS
-User information should (and eventually will) be stored elsewhere.
 .Sh HISTORY
 The
 .Nm
 utility appeared in
 .Bx 4.3 Reno .
+.Sh BUGS
+User information should (and eventually will) be stored elsewhere.