===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/passwd/passwd.1,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- src/usr.bin/passwd/passwd.1	2001/06/26 20:22:52	1.17
+++ src/usr.bin/passwd/passwd.1	2001/07/06 17:16:35	1.18
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: passwd.1,v 1.17 2001/06/26 20:22:52 hin Exp $
+.\"	$OpenBSD: passwd.1,v 1.18 2001/07/06 17:16:35 millert Exp $
 .\"
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -66,9 +66,11 @@
 A mixture of both lower and uppercase letters, numbers, and
 meta-characters is encouraged.
 .Pp
-The quality of the password can be enforced by providing an external
-checking program in 
-.Xr passwd.conf 5 .
+The quality of the password can be enforced by specifying an external
+checking program via the
+.Dq passwordcheck
+variable in
+.Xr login.conf 5 .
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
@@ -134,26 +136,36 @@
 .Pp
 Which type of cipher is used to encrypt the password information
 depends on the configuration in
-.Xr passwd.conf 5 .
-It can be different for local and YP passwords.
+.Xr login.conf 5 .
+It can be different for local
+.Po Do localcipher Dc Pc
+and YP
+.Po Do ypcipher Dc Pc
+passwords.
 .Sh DIAGNOSTICS
 .Bl -diag
-.It "the passwd file is busy"
+.It "The passwd file is busy..."
 The password file is currently locked by another process, or a
 process previously holding the lock was prematurely terminated.
-In the latter case, it is safe to remove the
+To determine whether another process is holding the lock, the
+admin may run the following:
+.Bd -literal -offset indent
+fstat /etc/ptmp
+.Ed
+.Pp
+If no process is listed, it is safe to remove the
 .Pa /etc/ptmp
 file to get rid of this error.
 .Sh FILES
 .Bl -tag -width /etc/master.passwd -compact
+.It /etc/login.conf
+configuration options
 .It Pa /etc/master.passwd
 user database
 .It Pa /etc/passwd
 a Version 7 format password file
 .It Pa /etc/passwd.XXXXXX
 temporary copy of the password file
-.It /etc/passwd.conf
-configuration options
 .It /etc/ptmp
 lock file for the passwd database
 .El
@@ -162,8 +174,8 @@
 .Xr kerberos 1 ,
 .Xr kinit 1 ,
 .Xr login 1 ,
+.Xr login.conf 5 ,
 .Xr passwd 5 ,
-.Xr passwd.conf 5 ,
 .Xr pwd_mkdb 8 ,
 .Xr vipw 8
 .Rs