===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/chpass/chpass.1,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/chpass/chpass.1	2000/10/07 14:07:08	1.19
--- src/usr.bin/chpass/chpass.1	2000/10/17 18:52:19	1.20
***************
*** 1,4 ****
! .\"	$OpenBSD: chpass.1,v 1.19 2000/10/07 14:07:08 aaron Exp $
  .\"	$NetBSD: chpass.1,v 1.7 1996/05/15 21:50:40 jtc Exp $
  .\"
  .\" Copyright (c) 1988, 1990, 1993
--- 1,4 ----
! .\"	$OpenBSD: chpass.1,v 1.20 2000/10/17 18:52:19 aaron Exp $
  .\"	$NetBSD: chpass.1,v 1.7 1996/05/15 21:50:40 jtc Exp $
  .\"
  .\" Copyright (c) 1988, 1990, 1993
***************
*** 213,218 ****
--- 213,227 ----
  uses
  .Xr pwd_mkdb 8
  to update the user database.
+ .Sh DIAGNOSTICS
+ .Bl -diag
+ .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
+ .Pa /etc/ptmp
+ file to get rid of this error.
+ .El
  .Sh ENVIRONMENT
  The
  .Xr vi 1
***************
*** 232,241 ****
  a Version 7 format password file
  .It Pa /etc/ptmp
  lock file for the passwd database
- .It Pa /var/tmp/pw.XXXXXXXX
- temporary copy of the user passwd information
  .It Pa /etc/shells
  list of approved shells
  .El
  .Sh SEE ALSO
  .Xr finger 1 ,
--- 241,250 ----
  a Version 7 format password file
  .It Pa /etc/ptmp
  lock file for the passwd database
  .It Pa /etc/shells
  list of approved shells
+ .It Pa /var/tmp/pw.XXXXXXXX
+ temporary copy of the user passwd information
  .El
  .Sh SEE ALSO
  .Xr finger 1 ,