MFH

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

diff --git a/chpass/chpass.1 b/chpass/chpass.1
index c48967a0b49c7c97725bd8df77ac846acb398c5f..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
@@ -63,11 +58,23 @@
 .Sh DESCRIPTION
 The
 .Nm
-program
+utility
 allows editing of the user database information associated
 with
 .Ar user
 or, by default, the current user.
+.Pp
+The
+.Nm chfn ,
+.Nm chsh ,
+.Nm ypchpass ,
+.Nm ypchfn
+and
+.Nm ypchsh
+utilities behave identically to
+.Nm .
+(There is only one program.)
+.Pp
 The information is formatted and supplied to an editor for changes.
 .Pp
 Only the information that the user is allowed to change is displayed.
@@ -151,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
@@ -203,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
@@ -254,8 +262,9 @@ for an explanation of the impact of setting the
 .Ev PW_SCAN_BIG_IDS
 environment variable.
 .Sh NIS INTERACTION
-.Nm Chpass
-can also be used in conjunction with NIS, however some restrictions
+The
+.Nm
+utility can also be used in conjunction with NIS, however some restrictions
 apply.
 Currently,
 .Nm
@@ -308,11 +317,11 @@ 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" .
-.Nm Chpass
-will prompt for the user's NIS password before effecting
+The
+.Nm
+utility will prompt for the user's NIS password before effecting
 any changes.
 If the password is invalid, all changes will be
 discarded.
@@ -325,8 +334,9 @@ choose to turn off this feature using the
 flag, described below.)
 .It
 .Em "Adding new records to the local password database is discouraged" .
-.Nm Chpass
-will allow the administrator to add new records to the
+The
+.Nm
+utility will allow the administrator to add new records to the
 local password database while NIS is enabled, but this can lead to
 some confusion since the new records are appended to the end of
 the master password file, usually after the special NIS '+' entries.
@@ -341,8 +351,9 @@ to the NIS password maps, provided the
 server has been started with the
 .Fl a
 flag to permitted additions (it refuses them by default).
-.Nm Chpass
-tries to update the local password database by default; to update the
+The
+.Nm
+utility tries to update the local password database by default; to update the
 NIS maps instead, invoke chpass with the
 .Fl y
 flag.
@@ -376,7 +387,7 @@ is compiled with NIS support:
 Force
 .Nm
 to modify the local copy of a user's password
-information in the even that a user exists in both
+information in the event that a user exists in both
 the local and NIS databases.
 .It Fl y
 Opposite effect of
@@ -386,10 +397,11 @@ This flag is largely redundant since
 operates on NIS entries by default if NIS is enabled.
 .It Fl d Ar domain
 Specify a particular NIS domain.
-.Nm Chpass
-uses the system domain name by default, as set by the
+The
+.Nm
+utility uses the system domain name by default, as set by the
 .Xr domainname 1
-command.
+utility.
 The
 .Fl d
 option can be used to override a default, or to specify a domain
@@ -420,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
@@ -430,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
@@ -456,28 +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 NOTES
-The
-.Xr chfn 1 ,
-.Xr chsh 1 ,
-.Xr ypchpass 1 ,
-.Xr ypchfn 1
-and
-.Xr ypchsh 1
-commands are really only links to
-.Nm .
-.Sh BUGS
-User information should (and eventually will) be stored elsewhere.
 .Sh HISTORY
 The
 .Nm
-command appeared in
+utility appeared in
 .Bx 4.3 Reno .
+.Sh BUGS
+User information should (and eventually will) be stored elsewhere.