From 68bc198e0ccce066fa104db3d7b81ef9c61848dc Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sun, 14 Aug 2016 14:57:16 +0000
Subject: [PATCH] Refer to /etc/passwd consistently as the "legacy password
 file" and remove some references to differences between versions 6 and 7.

ok jmc, millert, tedu
---
 src/lib/libutil/pw_init.3 |  6 +++---
 src/lib/libutil/pw_lock.3 | 12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/lib/libutil/pw_init.3 b/src/lib/libutil/pw_init.3
index 8d5ae174..afa691cf 100644
--- a/src/lib/libutil/pw_init.3
+++ b/src/lib/libutil/pw_init.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pw_init.3,v 1.13 2015/09/14 13:45:25 schwarze Exp $
+.\"	$OpenBSD: pw_init.3,v 1.14 2016/08/14 14:57:16 tb Exp $
 .\"
 .\" Copyright (c) 1995
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 14 2015 $
+.Dd $Mdocdate: August 14 2016 $
 .Dt PW_INIT 3
 .Os
 .Sh NAME
@@ -205,7 +205,7 @@ returns 1.
 .It Pa /etc/master.passwd
 Current password file.
 .It Pa /etc/passwd
-A Version 7 format password file.
+Legacy password file.
 .It Pa /etc/ptmp
 Password lock file.
 .It Pa /etc/pwd.db
diff --git a/src/lib/libutil/pw_lock.3 b/src/lib/libutil/pw_lock.3
index 4c0022a4..4c943626 100644
--- a/src/lib/libutil/pw_lock.3
+++ b/src/lib/libutil/pw_lock.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pw_lock.3,v 1.19 2015/10/15 19:35:24 deraadt Exp $
+.\"	$OpenBSD: pw_lock.3,v 1.20 2016/08/14 14:57:16 tb Exp $
 .\"
 .\" Copyright (c) 1995
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 15 2015 $
+.Dd $Mdocdate: August 14 2016 $
 .Dt PW_LOCK 3
 .Os
 .Sh NAME
@@ -95,11 +95,13 @@ are specified by OR'ing the following values:
 only update the secure database file
 .Pq Pa /etc/spwd.db .
 .It Dv _PASSWORD_OMITV7
-do not update the Version 7 format password file
+do not update the legacy password file
 .Pq Pa /etc/passwd .
 .El
 .Pp
-By default the secure, insecure and Version 7 format password databases
+By default the secure and insecure password databases and
+the legacy password file
+.Pa /etc/passwd
 are updated.
 You should finish writing to and close the file descriptor returned by
 .Fn pw_lock
@@ -129,7 +131,7 @@ function returns \-1 if it is unable to complete properly.
 .It Pa /etc/master.passwd
 Current password file.
 .It Pa /etc/passwd
-A Version 7 format password file.
+Legacy password file.
 .It Pa /etc/ptmp
 Password lock file.
 .It Pa /etc/pwd.db