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

6 files changed, 22 insertions, 22 deletions

diff --git a/lib/libc/gen/getpwent.3 b/lib/libc/gen/getpwent.3
index 1189f238658..c975d387544 100644
--- a/lib/libc/gen/getpwent.3
+++ b/lib/libc/gen/getpwent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getpwent.3,v 1.30 2015/10/27 04:41:18 guenther Exp $
+.\"	$OpenBSD: getpwent.3,v 1.31 2016/08/14 14:57:16 tb Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 27 2015 $
+.Dd $Mdocdate: August 14 2016 $
 .Dt GETPWENT 3
 .Os
 .Sh NAME
@@ -131,7 +131,7 @@ secure password database file
 .It Pa /etc/master.passwd
 current password file
 .It Pa /etc/passwd
-a Version 7 format password file
+legacy password file
 .El
 .Sh ERRORS
 The
diff --git a/lib/libc/gen/getpwnam.3 b/lib/libc/gen/getpwnam.3
index abdb8c2ac7a..21e7884ce6d 100644
--- a/lib/libc/gen/getpwnam.3
+++ b/lib/libc/gen/getpwnam.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getpwnam.3,v 1.10 2015/11/18 19:32:23 tedu Exp $
+.\"	$OpenBSD: getpwnam.3,v 1.11 2016/08/14 14:57:16 tb Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 18 2015 $
+.Dd $Mdocdate: August 14 2016 $
 .Dt GETPWNAM 3
 .Os
 .Sh NAME
@@ -199,7 +199,7 @@ secure password database file
 .It Pa /etc/master.passwd
 current password file
 .It Pa /etc/passwd
-a Version 7 format password file
+legacy password file
 .El
 .Sh ERRORS
 The
diff --git a/lib/libutil/pw_init.3 b/lib/libutil/pw_init.3
index 8d5ae174d26..afa691cf17b 100644
--- a/lib/libutil/pw_init.3
+++ b/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/lib/libutil/pw_lock.3 b/lib/libutil/pw_lock.3
index 4c0022a4067..4c9436267e2 100644
--- a/lib/libutil/pw_lock.3
+++ b/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
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.8 b/usr.sbin/pwd_mkdb/pwd_mkdb.8
index cf4202cf231..6b935ceb040 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.8
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pwd_mkdb.8,v 1.25 2016/05/09 11:13:10 naddy Exp $
+.\"	$OpenBSD: pwd_mkdb.8,v 1.26 2016/08/14 14:57:15 tb Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)pwd_mkdb.8	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: May 9 2016 $
+.Dd $Mdocdate: August 14 2016 $
 .Dt PWD_MKDB 8
 .Os
 .Sh NAME
@@ -60,8 +60,6 @@ The
 .Ar file
 must be in the correct format (see
 .Xr passwd 5 ) .
-It is important to note that the format used in this system is
-different from the historic 6th Edition-style format.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
@@ -125,7 +123,7 @@ exits zero on success, non-zero on failure.
 .It Pa /etc/master.passwd
 current password file
 .It Pa /etc/passwd
-a 6th Edition-style password file
+legacy password file
 .It Pa /etc/pwd.db
 insecure password database file
 .It Pa /etc/pwd.db.tmp
diff --git a/usr.sbin/vipw/vipw.8 b/usr.sbin/vipw/vipw.8
index 6a62d03370b..f014901e361 100644
--- a/usr.sbin/vipw/vipw.8
+++ b/usr.sbin/vipw/vipw.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vipw.8,v 1.12 2015/03/13 19:58:41 jmc Exp $
+.\"	$OpenBSD: vipw.8,v 1.13 2016/08/14 14:57:15 tb Exp $
 .\"	$NetBSD: vipw.8,v 1.4 1995/01/20 19:19:56 mycroft Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)vipw.8	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: March 13 2015 $
+.Dd $Mdocdate: August 14 2016 $
 .Dt VIPW 8
 .Os
 .Sh NAME
@@ -91,7 +91,7 @@ will be invoked instead of the default editor
 .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