Correct English just like jsing@ did it in passwd/local_passwd.c rev. 1.38

on April 27, 2008.  While here, fix a typo and drop an obsolete BUGS section.

"my typo so OK millert@ :-)" and OK jmc@

3 files changed, 9 insertions, 11 deletions

diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index b946067af1d..b5e464fb674 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chpass.1,v 1.36 2012/06/19 10:53:40 jmc Exp $
+.\"	$OpenBSD: chpass.1,v 1.37 2012/06/20 21:32:27 schwarze Exp $
 .\"	$NetBSD: chpass.1,v 1.7 1996/05/15 21:50:40 jtc Exp $
 .\"
 .\" Copyright (c) 1988, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
 .\"
-.Dd $Mdocdate: June 19 2012 $
+.Dd $Mdocdate: June 20 2012 $
 .Dt CHPASS 1
 .Os
 .Sh NAME
@@ -240,7 +240,7 @@ temporary copy of the user passwd information
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
-.It "Attempting lock password file, please wait or press ^C to abort"
+.It "Attempting to lock password file, please wait or press ^C to abort"
 .Pp
 The password file is currently locked by another process;
 .Nm
@@ -283,5 +283,3 @@ The
 .Nm
 command appeared in
 .Bx 4.3 Reno .
-.Sh BUGS
-User information should (and eventually will) be stored elsewhere.
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index dd32cb4c86d..516ef7d5e27 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chpass.c,v 1.37 2009/10/27 23:59:36 deraadt Exp $	*/
+/*	$OpenBSD: chpass.c,v 1.38 2012/06/20 21:32:27 schwarze Exp $	*/
 /*	$NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $	*/
 
 /*-
@@ -206,7 +206,7 @@ main(int argc, char *argv[])
 	pw_init();
 	for (i = 1; (tfd = pw_lock(0)) == -1; i++) {
 		if (i == 4)
-			(void)fputs("Attempting lock password file, "
+			(void)fputs("Attempting to lock password file, "
 			    "please wait or press ^C to abort", stderr);
 		(void)signal(SIGINT, kbintr);
 		if (i % 16 == 0)
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 77d78a334c3..c8bff266341 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: passwd.1,v 1.34 2012/06/19 10:53:40 jmc Exp $
+.\"	$OpenBSD: passwd.1,v 1.35 2012/06/20 21:32:27 schwarze Exp $
 .\"
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)passwd.1	6.11 (Berkeley) 7/24/91
 .\"
-.Dd $Mdocdate: June 19 2012 $
+.Dd $Mdocdate: June 20 2012 $
 .Dt PASSWD 1
 .Os
 .Sh NAME
@@ -125,7 +125,7 @@ lock file for the passwd database
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
-.It "Attempting lock password file, please wait or press ^C to abort"
+.It "Attempting to lock password file, please wait or press ^C to abort"
 .Pp
 The password file is currently locked by another process;
 .Nm
@@ -133,7 +133,7 @@ will keep trying to lock the password file until it succeeds or
 you hit the interrupt character (control-C by default).
 If
 .Nm
-is interrupted while trying to gain the lock the password changed will
+is interrupted while trying to gain the lock the password change will
 be lost.
 .Pp
 If the process holding the lock was prematurely terminated the lock