diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile
index 3c122431557b..4d75e60c9c4e 100644
--- a/share/man/man5/Makefile
+++ b/share/man/man5/Makefile
@@ -1,5 +1,7 @@
-#	from: @(#)Makefile	5.7.1.1 (Berkeley) 5/7/91
-#	$Id: Makefile,v 1.9 1994/01/26 09:08:20 deraadt Exp $
+#	$NetBSD: Makefile,v 1.10 1994/11/30 19:31:07 jtc Exp $
+#	@(#)Makefile	8.1 (Berkeley) 6/5/93
+
+# missing: dump.0 plot.0 
 
 MAN5=	a.out.0 acct.0 core.0 dir.0 disktab.0 ethers.0 fs.0 fstab.0 group.0 \
 	hosts.0 link.0 networks.0 passwd.0 pcfs.0 phones.0 printcap.0 \
@@ -7,4 +9,13 @@ MAN5=	a.out.0 acct.0 core.0 dir.0 disktab.0 ethers.0 fs.0 fstab.0 group.0 \
 	types.0 utmp.0
 MLINKS=	dir.5 dirent.5 fs.5 inode.5 utmp.5 wtmp.5 utmp.5 lastlog.5
 
+all: ${MAN5}
+
+clean depend lint tags:
+
+cleandir:
+	rm -f ${MAN5}
+
+install: maninstall
+
 .include <bsd.prog.mk>
diff --git a/share/man/man5/a.out.5 b/share/man/man5/a.out.5
index 1cc70b9e1412..202c2bfef5bc 100644
--- a/share/man/man5/a.out.5
+++ b/share/man/man5/a.out.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: a.out.5,v 1.8 1994/11/30 19:31:09 jtc Exp $
+.\"
+.\" Copyright (c) 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This man page is derived from documentation contributed to Berkeley by
 .\" Donn Seeley at UUNET Technologies, Inc.
@@ -32,10 +34,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	from: @(#)a.out.5	6.3 (Berkeley) 4/29/91
-.\"	$Id: a.out.5,v 1.7 1994/08/14 07:48:58 mycroft Exp $
+.\"	@(#)a.out.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd April 29, 1991
+.Dd June 5, 1993
 .Dt A.OUT 5
 .Os
 .Sh NAME
diff --git a/share/man/man5/acct.5 b/share/man/man5/acct.5
index 0784cbe06a69..2cea4a35ebcd 100644
--- a/share/man/man5/acct.5
+++ b/share/man/man5/acct.5
@@ -1,5 +1,7 @@
-.\" Copyright 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: acct.5,v 1.3 1994/11/30 19:31:10 jtc Exp $
+.\"
+.\" Copyright (c) 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)acct.5	6.3 (Berkeley) 4/29/91
-.\"	$Id: acct.5,v 1.2 1993/08/01 07:35:35 mycroft Exp $
+.\"     @(#)acct.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd April 29, 1991
+.Dd June 5, 1993
 .Dt ACCT 5
 .Os
 .Sh NAME
diff --git a/share/man/man5/core.5 b/share/man/man5/core.5
index 8e06a8939c5b..15af86b7dcd6 100644
--- a/share/man/man5/core.5
+++ b/share/man/man5/core.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1980, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: core.5,v 1.4 1994/11/30 19:31:11 jtc Exp $
+.\"
+.\" Copyright (c) 1980, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)core.5	6.3 (Berkeley) 4/29/91
-.\"	$Id: core.5,v 1.3 1994/03/19 18:52:30 mycroft Exp $
+.\"     @(#)core.5	8.3 (Berkeley) 12/11/93
 .\"
-.Dd April 29, 1991
+.Dd December 11, 1993
 .Dt CORE 5
 .Os BSD 4
 .Sh NAME
@@ -43,27 +44,26 @@
 .Sh DESCRIPTION
 A small number of signals which cause abnormal termination of a process
 also cause a record of the process's in-core state to be written
-to disk for later examination by one of the aviailable debuggers.
+to disk for later examination by one of the available debuggers.
 (See
 .Xr sigaction 2 . )
 This memory image is written to a file named
-.Nm program.core
-in the working directory (where ``program'' is the name of the process
-which terminated abnormally, typically the name of an executable file);
+.Nm programname.core
+in the working directory;
 provided the terminated process had write permission in the directory,
-and provided the abnormality did not caused
+and provided the abnormality did not cause
 a system crash.
 (In this event, the decision to save the core file is arbitrary, see
 .Xr savecore 8 . )
 .Pp
 The maximum size of a
-.Nm core
+.Nm programname.core
 file is limited by
 .Xr setrlimit 2 .
 Files which would be larger than the limit are not created.
 .Pp
 The
-.Nm core
+.Nm programname.core
 file consists of the
 .Fa u .
 area, whose size (in pages) is
@@ -78,11 +78,11 @@ area starts with a
 structure as given in
 .Aq Pa sys/user.h .
 The remainder of the
-.Nm core
+.Nm programname.core
 file consists of the data pages followed by
 the stack pages of the process image.
 The amount of data space image in the
-.Nm core
+.Nm programname.core
 file is given (in pages) by the
 variable
 .Fa u_dsize
@@ -108,6 +108,6 @@ The size of a ``page'' is given by the constant
 .Xr setrlimit 2
 .Sh HISTORY
 A
-.Nm
+.Nm core
 file format appeared in
 .At v6 .
diff --git a/share/man/man5/dir.5 b/share/man/man5/dir.5
index d65e4f79c069..ae3b80a696a8 100644
--- a/share/man/man5/dir.5
+++ b/share/man/man5/dir.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1983, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: dir.5,v 1.4 1994/11/30 19:31:14 jtc Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)dir.5	6.2 (Berkeley) 4/29/91
-.\"	$Id: dir.5,v 1.3 1993/10/05 00:39:46 jtc Exp $
+.\"     @(#)dir.5	8.3 (Berkeley) 4/19/94
 .\"
-.Dd April 29, 1991
+.Dd April 19, 1994
 .Dt DIR 5
 .Os BSD 4.2
 .Sh NAME
@@ -43,19 +44,19 @@
 .Fd #include <sys/types.h>
 .Fd #include <sys/dir.h>
 .Sh DESCRIPTION
-Directories provide a convienent hierarchical method of grouping
+Directories provide a convenient hierarchical method of grouping
 files while obscuring the underlying details of the storage medium.
 A directory file is differentiated from a plain file
 by a flag in its
 .Xr inode 5
 entry.
-It consists of records (directory entries) each of which contain
+It consists of records (directory entries) each of which contains
 information about a file and a pointer to the file itself.
 Directory entries may contain other directories
 as well as plain files; such nested directories are refered to as
 subdirectories. 
 A hierarchy of directories and files is formed in this manner
-and is called a file system (or refered to as a file system tree).
+and is called a file system (or referred to as a file system tree).
 .\" An entry in this tree,
 .\" nested or not nested,
 .\" is a pathname.
diff --git a/share/man/man5/disktab.5 b/share/man/man5/disktab.5
index 53b2cfcd2e1a..04eddd2cca70 100644
--- a/share/man/man5/disktab.5
+++ b/share/man/man5/disktab.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1983, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: disktab.5,v 1.4 1994/11/30 19:31:15 jtc Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)disktab.5	6.6 (Berkeley) 5/2/91
-.\"	$Id: disktab.5,v 1.3 1994/01/28 02:22:24 jtc Exp $
+.\"     @(#)disktab.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd May 2, 1991
+.Dd June 5, 1993
 .Dt DISKTAB 5
 .Os BSD 4.2
 .Sh NAME
diff --git a/share/man/man5/ethers.5 b/share/man/man5/ethers.5
index 6b421e69880c..26a681ed19f9 100644
--- a/share/man/man5/ethers.5
+++ b/share/man/man5/ethers.5
@@ -1,3 +1,4 @@
+.\"	$NetBSD: ethers.5,v 1.2 1994/11/30 19:31:16 jtc Exp $
 .\"
 .\"     Written by Roland McGrath <roland@frob.com>.  Public domain.
 .\"
diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5
index 9cb3d0ace45c..5d7c2b04d822 100644
--- a/share/man/man5/fs.5
+++ b/share/man/man5/fs.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1983, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: fs.5,v 1.3 1994/11/30 19:31:17 jtc Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)fs.5	6.4 (Berkeley) 4/29/91
-.\"	$Id: fs.5,v 1.2 1993/08/01 07:35:31 mycroft Exp $
+.\"     @(#)fs.5	8.2 (Berkeley) 4/19/94
 .\"
-.Dd April 29, 1991
+.Dd April 19, 1994
 .Dt FS 5
 .Os BSD 4.2
 .Sh NAME
@@ -149,7 +150,7 @@ struct fs {
 	quad	fs_qbmask;	/* ~fs_bmask - for use with quad size */
 	quad	fs_qfmask;	/* ~fs_fmask - for use with quad size */
 	long	fs_postblformat; /* format of positional layout tables */
-	long	fs_nrpos;	/* number of rotaional positions */
+	long	fs_nrpos;	/* number of rotational positions */
 	long	fs_postbloff;	/* (short) rotation block list head */
 	long	fs_rotbloff;	/* (u_char) blocks for each rotation */
 	long	fs_magic;	/* magic number */
diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5
index 7332869862cd..48d6e14357ba 100644
--- a/share/man/man5/fstab.5
+++ b/share/man/man5/fstab.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1980, 1989, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: fstab.5,v 1.4 1994/11/30 19:31:18 jtc Exp $
+.\"
+.\" Copyright (c) 1980, 1989, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)fstab.5	6.5 (Berkeley) 5/10/91
-.\"	$Id: fstab.5,v 1.3 1993/11/28 08:48:42 mycroft Exp $
+.\"     @(#)fstab.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd May 10, 1991
+.Dd June 5, 1993
 .Dt FSTAB 5
 .Os BSD 4
 .Sh NAME
diff --git a/share/man/man5/group.5 b/share/man/man5/group.5
index 1987ee75e729..2a3b7d85015b 100644
--- a/share/man/man5/group.5
+++ b/share/man/man5/group.5
@@ -1,5 +1,7 @@
-.\" Copyright 1980, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: group.5,v 1.3 1994/11/30 19:31:19 jtc Exp $
+.\"
+.\" Copyright (c) 1980, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)group.5	6.2 (Berkeley) 4/29/91
-.\"	$Id: group.5,v 1.2 1993/08/01 07:35:29 mycroft Exp $
+.\"     @(#)group.5	8.3 (Berkeley) 4/19/94
 .\"
-.Dd April 29, 1991
+.Dd April 19, 1994
 .Dt GROUP 5
 .Os
 .Sh NAME
@@ -78,9 +79,9 @@ This field is rarely used
 and an asterisk is normally placed in it rather than leaving it blank.
 The 
 .Ar member
-field contains the names of users granted the priviledges of
+field contains the names of users granted the privileges of
 .Ar group .
-The member names are separated by commas with out spaces or newlines.
+The member names are separated by commas without spaces or newlines.
 A user is automatically in a group if that group was specified
 in their
 .Pa /etc/passwd
diff --git a/share/man/man5/hosts.5 b/share/man/man5/hosts.5
index fab746a78c7a..f38295bad346 100644
--- a/share/man/man5/hosts.5
+++ b/share/man/man5/hosts.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1983, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: hosts.5,v 1.4 1994/11/30 19:31:20 jtc Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)hosts.5	6.6 (Berkeley) 5/10/91
-.\"	$Id: hosts.5,v 1.3 1994/01/11 04:14:13 deraadt Exp $
+.\"     @(#)hosts.5	8.2 (Berkeley) 12/11/93
 .\"
-.Dd May 10, 1991
+.Dd December 11, 1993
 .Dt HOSTS 5
 .Os BSD 4.2
 .Sh NAME
@@ -74,7 +75,7 @@ though local changes may be required
 to bring it up to date regarding unofficial aliases
 and/or unknown hosts.  As the data base maintained at
 .Tn NIC
-is incomplete, use of the name server is recommend for
+is incomplete, use of the name server is recommended for
 sites on the
 .Tn DARPA
 Internet.
diff --git a/share/man/man5/link.5 b/share/man/man5/link.5
index 2ef5d20ca54d..ab53519de0ba 100644
--- a/share/man/man5/link.5
+++ b/share/man/man5/link.5
@@ -1,3 +1,4 @@
+.\"	$NetBSD: link.5,v 1.3 1994/11/30 19:31:21 jtc Exp $
 .\"
 .\" Copyright (c) 1993 Paul Kranenburg
 .\" All rights reserved.
@@ -27,8 +28,6 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: link.5,v 1.2 1994/06/09 15:52:17 pk Exp $
-.\"
 .Dd October 23, 1993
 .Dt LINK 5
 .Os
diff --git a/share/man/man5/networks.5 b/share/man/man5/networks.5
index 53b2e45f19c8..8e4ad008468f 100644
--- a/share/man/man5/networks.5
+++ b/share/man/man5/networks.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1983, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: networks.5,v 1.3 1994/11/30 19:31:23 jtc Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)networks.5	6.5 (Berkeley) 5/10/91
-.\"	$Id: networks.5,v 1.2 1993/08/01 07:35:27 mycroft Exp $
+.\"     @(#)networks.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd May 10, 1991
+.Dd June 5, 1993
 .Dt NETWORKS 5
 .Os BSD 4.2
 .Sh NAME
diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5
index 9a9b1e5ec723..227bf6d84a7b 100644
--- a/share/man/man5/passwd.5
+++ b/share/man/man5/passwd.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1988, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: passwd.5,v 1.3 1994/11/30 19:31:24 jtc Exp $
+.\"
+.\" Copyright (c) 1988, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)passwd.5	6.7 (Berkeley) 4/29/91
-.\"	$Id: passwd.5,v 1.2 1993/08/01 07:35:26 mycroft Exp $
+.\"     @(#)passwd.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd April 29, 1991
+.Dd June 5, 1993
 .Dt PASSWD 5
 .Os
 .Sh NAME
@@ -158,11 +159,28 @@ is assumed.
 .Xr login 1 ,
 .Xr passwd 1 ,
 .Xr getpwent 3 ,
-.Xr mkpasswd 8 ,
+.Xr adduser 8 ,
+.Xr pwd_mkdb 8 ,
 .Xr vipw 8
-.Xr adduser 8
 .Sh BUGS
 User information should (and eventually will) be stored elsewhere.
+.Sh COMPATIBILITY
+The password file format has changed since 4.3BSD.
+The following awk script can be used to convert your old-style password
+file into a new style password file.
+The additional fields
+.Dq class ,
+.Dq change
+and
+.Dq expire
+are added, but are turned off by default.
+Class is currently not implemented, but change and expire are; to set them,
+use the current day in seconds from the epoch + whatever number of seconds
+of offset you want.
+.Bd -literal -offset indent
+BEGIN { FS = ":"}
+{ print $1 ":" $2 ":" $3 ":" $4 "::0:0:" $5 ":" $6 ":" $7 }
+.Ed
 .Sh HISTORY
 A
 .Nm
diff --git a/share/man/man5/phones.5 b/share/man/man5/phones.5
index 5688e7dd6777..35b9ac0dc4e9 100644
--- a/share/man/man5/phones.5
+++ b/share/man/man5/phones.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1983, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: phones.5,v 1.3 1994/11/30 19:31:25 jtc Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)phones.5	6.3 (Berkeley) 5/2/91
-.\"	$Id: phones.5,v 1.2 1993/08/01 07:35:25 mycroft Exp $
+.\"     @(#)phones.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd May 2, 1991
+.Dd June 5, 1993
 .Dt PHONES 5
 .Os BSD 4.2
 .Sh NAME
diff --git a/share/man/man5/printcap.5 b/share/man/man5/printcap.5
index 5e69088a7c0f..dd61121d43d9 100644
--- a/share/man/man5/printcap.5
+++ b/share/man/man5/printcap.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1983, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: printcap.5,v 1.4 1994/11/30 19:31:26 jtc Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)printcap.5	6.6 (Berkeley) 5/10/91
-.\"	$Id: printcap.5,v 1.3 1994/04/06 05:29:32 mycroft Exp $
+.\"     @(#)printcap.5	8.2 (Berkeley) 12/11/93
 .\"
-.Dd May 10, 1991
+.Dd December 11, 1993
 .Dt PRINTCAP 5
 .Os BSD 4.2
 .Sh NAME
@@ -66,7 +67,7 @@ to allow explicit naming of a destination printer.
 .Pp
 Refer to the
 .%T "4.3 BSD Line Printer Spooler Manual"
-for a complete discussion on how setup the database for a given printer.
+for a complete discussion on how to setup the database for a given printer.
 .Sh CAPABILITIES
 Refer to
 .Xr termcap 5
diff --git a/share/man/man5/protocols.5 b/share/man/man5/protocols.5
index 2ead6e985107..64363a85ac31 100644
--- a/share/man/man5/protocols.5
+++ b/share/man/man5/protocols.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1983, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: protocols.5,v 1.3 1994/11/30 19:31:27 jtc Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)protocols.5	6.5 (Berkeley) 5/10/91
-.\"	$Id: protocols.5,v 1.2 1993/08/01 07:35:23 mycroft Exp $
+.\"     @(#)protocols.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd May 10, 1991
+.Dd June 5, 1993
 .Dt PROTOCOLS 5
 .Os BSD 4.2
 .Sh NAME
diff --git a/share/man/man5/remote.5 b/share/man/man5/remote.5
index 4a004a2fc2a9..f5b71f21e5c2 100644
--- a/share/man/man5/remote.5
+++ b/share/man/man5/remote.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1983, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: remote.5,v 1.3 1994/11/30 19:31:28 jtc Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)remote.5	6.3 (Berkeley) 5/10/91
-.\"	$Id: remote.5,v 1.2 1993/08/01 07:35:22 mycroft Exp $
+.\"     @(#)remote.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd May 10, 1991
+.Dd June 5, 1993
 .Dt REMOTE 5
 .Os BSD 4.2
 .Sh NAME
diff --git a/share/man/man5/resolv.conf.5 b/share/man/man5/resolv.conf.5
index c37f9cfbba3e..08c1e067e423 100644
--- a/share/man/man5/resolv.conf.5
+++ b/share/man/man5/resolv.conf.5
@@ -1,3 +1,5 @@
+.\"	$NetBSD: resolv.conf.5,v 1.5 1994/11/30 19:31:29 jtc Exp $
+.\"
 .\" Copyright (c) 1986, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -29,8 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)resolver.5	5.12 (Berkeley) 5/10/91
-.\"	$Id: resolv.conf.5,v 1.4 1994/03/24 10:22:24 deraadt Exp $
+.\"     @(#)resolver.5	5.12 (Berkeley) 5/10/91
 .\"
 .Dd May 10, 1991
 .Dt RESOLV.CONF 5
diff --git a/share/man/man5/rpc.5 b/share/man/man5/rpc.5
index e7e39052cf03..b487b3948233 100644
--- a/share/man/man5/rpc.5
+++ b/share/man/man5/rpc.5
@@ -1,5 +1,5 @@
-.\"	from: @(#)rpc.5	2.2 88/08/03 4.0 RPCSRC; from 1.4 87/11/27 SMI;
-.\"	$Id: rpc.5,v 1.1 1993/10/07 07:29:01 cgd Exp $
+.\"	$NetBSD: rpc.5,v 1.2 1994/11/30 19:31:30 jtc Exp $
+.\"	@(#)rpc.5	2.2 88/08/03 4.0 RPCSRC; from 1.4 87/11/27 SMI;
 .\"
 .\"	See the DISCLAIMER and README files in /usr/src/lib/libc/rpc for
 .\"	more information about this file.
diff --git a/share/man/man5/services.5 b/share/man/man5/services.5
index 4a4bdbddaec3..ebfa74d926ef 100644
--- a/share/man/man5/services.5
+++ b/share/man/man5/services.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1983, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: services.5,v 1.3 1994/11/30 19:31:31 jtc Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)services.5	6.6 (Berkeley) 5/10/91
-.\"	$Id: services.5,v 1.2 1993/08/01 07:35:20 mycroft Exp $
+.\"     @(#)services.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd May 10, 1991
+.Dd June 5, 1993
 .Dt SERVICES 5
 .Os BSD 4.2
 .Sh NAME
diff --git a/share/man/man5/shells.5 b/share/man/man5/shells.5
index 03364bd7c365..a536ee0f4cfa 100644
--- a/share/man/man5/shells.5
+++ b/share/man/man5/shells.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1986, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: shells.5,v 1.3 1994/11/30 19:31:32 jtc Exp $
+.\"
+.\" Copyright (c) 1986, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)shells.5	5.4 (Berkeley) 5/10/91
-.\"	$Id: shells.5,v 1.2 1993/08/01 07:35:19 mycroft Exp $
+.\"     @(#)shells.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd May 10, 1991
+.Dd June 5, 1993
 .Dt SHELLS 5
 .Os BSD 4.2
 .Sh NAME
diff --git a/share/man/man5/stab.5 b/share/man/man5/stab.5
index 97f67efe9645..5003d72d8cbf 100644
--- a/share/man/man5/stab.5
+++ b/share/man/man5/stab.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1980, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: stab.5,v 1.3 1994/11/30 19:31:33 jtc Exp $
+.\"
+.\" Copyright (c) 1980, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)stab.5	6.5 (Berkeley) 5/10/91
-.\"	$Id: stab.5,v 1.2 1993/08/01 07:35:18 mycroft Exp $
+.\"     @(#)stab.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd May 10, 1991
+.Dd June 5, 1993
 .Dt STAB 5
 .Os BSD 4
 .Sh NAME
diff --git a/share/man/man5/types.5 b/share/man/man5/types.5
index 5e138c9cb983..b54a53690028 100644
--- a/share/man/man5/types.5
+++ b/share/man/man5/types.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1980, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: types.5,v 1.3 1994/11/30 19:31:34 jtc Exp $
+.\"
+.\" Copyright (c) 1980, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)types.5	6.2 (Berkeley) 4/29/91
-.\"	$Id: types.5,v 1.2 1993/08/01 07:35:17 mycroft Exp $
+.\"     @(#)types.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd April 29, 1991
+.Dd June 5, 1993
 .Dt TYPES 5
 .Os BSD 4
 .Sh NAME
diff --git a/share/man/man5/utmp.5 b/share/man/man5/utmp.5
index fe99f7b24ca1..bbfa03a39274 100644
--- a/share/man/man5/utmp.5
+++ b/share/man/man5/utmp.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1980, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: utmp.5,v 1.5 1994/11/30 19:31:35 jtc Exp $
+.\"
+.\" Copyright (c) 1980, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)utmp.5	6.8 (Berkeley) 5/5/91
-.\"	$Id: utmp.5,v 1.4 1994/10/19 04:01:14 cgd Exp $
+.\"     @(#)utmp.5	8.2 (Berkeley) 3/17/94
 .\"
-.Dd May 5, 1991
+.Dd March 17, 1994
 .Dt UTMP 5
 .Os BSD 4
 .Sh NAME
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index 71581c7298c3..86e1393c9aff 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,5 +1,5 @@
-#	from: @(#)Makefile	5.11 (Berkeley) 3/22/91
-#	$Id: Makefile,v 1.7 1994/10/18 06:48:51 deraadt Exp $
+#	$NetBSD: Makefile,v 1.8 1994/11/30 19:36:20 jtc Exp $
+#	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 MAN8=	adduser.0 compat_sunos.0 diskless.0 intro.0 rc.0 sticky.0 yp.0
 SUBDIR=	man8.amiga man8.hp300 man8.i386 man8.mac68k man8.sparc\
diff --git a/share/man/man8/adduser.8 b/share/man/man8/adduser.8
index dd42d0904865..49714be08f98 100644
--- a/share/man/man8/adduser.8
+++ b/share/man/man8/adduser.8
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1980, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: adduser.8,v 1.4 1994/11/30 19:36:21 jtc Exp $
+.\"
+.\" Copyright (c) 1980, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)adduser.8	6.8 (Berkeley) 3/16/91
-.\"	$Id: adduser.8,v 1.3 1994/01/22 08:33:07 glass Exp $
+.\"     @(#)adduser.8	8.1 (Berkeley) 6/5/93
 .\"
-.Dd March 16, 1991
+.Dd June 5, 1993
 .Dt ADDUSER 8
 .Os BSD 4
 .Sh NAME
@@ -105,7 +106,7 @@ skeletal login directory
 .Xr passwd 1 ,
 .Xr aliases 5 ,
 .Xr passwd 5 ,
-.Xr mkpasswd 8 ,
+.Xr pwd_mkdb 8 ,
 .Xr vipw 8
 .Sh BUGS
 User information should (and eventually will) be stored elsewhere.
diff --git a/share/man/man8/compat_sunos.8 b/share/man/man8/compat_sunos.8
index 8454b5ba8191..c6f1a55f7954 100644
--- a/share/man/man8/compat_sunos.8
+++ b/share/man/man8/compat_sunos.8
@@ -1,3 +1,5 @@
+.\"	$NetBSD: compat_sunos.8,v 1.4 1994/11/30 19:36:22 jtc Exp $
+.\"
 .\" Copyright (c) 1984 Theo de Raadt
 .\" All rights reserved.
 .\"
@@ -28,8 +30,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: compat_sunos.8,v 1.3 1994/09/28 01:41:05 deraadt Exp $
-.\"
 .Dd June 15, 1994
 .Dt COMPAT_SUNOS 8
 .Os BSD 4
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index 638417a0fc6a..91274a5443f9 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -1,3 +1,5 @@
+.\"	$NetBSD: diskless.8,v 1.2 1994/11/30 19:36:23 jtc Exp $
+.\"
 .\"
 .\" Copyright (c) 1994 Gordon W. Ross, Theo de Raadt
 .\" All rights reserved.
@@ -24,8 +26,6 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: diskless.8,v 1.1 1994/10/18 06:48:54 deraadt Exp $
-.\"
 .Dd October 2, 1994
 .Dt DISKLESS 8
 .Os NetBSD
diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8
index 6df1b8856a95..5bfcf3fcf32b 100644
--- a/share/man/man8/intro.8
+++ b/share/man/man8/intro.8
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1983, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: intro.8,v 1.3 1994/11/30 19:36:24 jtc Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	from: @(#)intro.8	6.5 (Berkeley) 8/5/91
-.\"	$Id: intro.8,v 1.2 1993/08/01 07:54:58 mycroft Exp $
+.\"	@(#)intro.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd August 5, 1991
+.Dd December 11, 1993
 .Dt INTRO 8
 .Os BSD 4.2
 .Sh NAME
@@ -51,10 +52,11 @@ maintain system backups,
 .Ql Xr dump ,
 and recover files when disks die an untimely death,
 .Ql Xr restore .
-The manual 
+The
 .Ql Xr format
-should be consulted when formatting disk packs respective
-to the architecture the system is running on.
+manual
+for the specific architecture the system is running on should be
+consulted when formatting disks and tapes.
 Network related services like
 .Ql Xr inetd
 and
@@ -62,7 +64,7 @@ and
 are also described.
 The section
 .Ql Xr crash
-should be consulted in understanding how to interpret system
+should be consulted to understand how to interpret system
 crash dumps.
 .Sh HISTORY
 The
diff --git a/share/man/man8/makedev.8 b/share/man/man8/makedev.8
index dede5ee0636e..1d6d90817f69 100644
--- a/share/man/man8/makedev.8
+++ b/share/man/man8/makedev.8
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1983, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: makedev.8,v 1.3 1994/11/30 19:36:25 jtc Exp $
+.\"
+.\" Copyright (c) 1983, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)makedev.8	6.3 (Berkeley) 3/16/91
-.\"	$Id: makedev.8,v 1.2 1993/08/01 07:54:56 mycroft Exp $
+.\"     @(#)makedev.8	8.1 (Berkeley) 6/5/93
 .\"
-.Dd March 16, 1991
+.Dd June 5, 1993
 .Dt MAKEDEV 8
 .Os BSD 4.2
 .Sh NAME
diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8
index 1204d205f744..c02fb0b7b3b2 100644
--- a/share/man/man8/rc.8
+++ b/share/man/man8/rc.8
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1980, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: rc.8,v 1.3 1994/11/30 19:36:26 jtc Exp $
+.\"
+.\" Copyright (c) 1980, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)rc.8	6.2 (Berkeley) 3/16/91
-.\"	$Id: rc.8,v 1.2 1993/08/01 07:54:55 mycroft Exp $
+.\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd March 16, 1991
+.Dd December 11, 1993
 .Dt RC 8
 .Os BSD 4
 .Sh NAME
@@ -67,7 +68,7 @@ is run.
 .Pp
 The second part of
 .Nm rc ,
-which is run after a auto-reboot succeeds and also if
+which is run after an auto-reboot succeeds and also if
 .Nm rc
 is invoked when a single user shell terminates (see
 .Xr init 8 ) ,
diff --git a/share/man/man8/sticky.8 b/share/man/man8/sticky.8
index 210467f88577..956af6c24c2a 100644
--- a/share/man/man8/sticky.8
+++ b/share/man/man8/sticky.8
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1980, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: sticky.8,v 1.3 1994/11/30 19:36:27 jtc Exp $
+.\"
+.\" Copyright (c) 1980, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)sticky.8	6.4 (Berkeley) 3/16/91
-.\"	$Id: sticky.8,v 1.2 1993/08/01 07:54:52 mycroft Exp $
+.\"     @(#)sticky.8	8.1 (Berkeley) 6/5/93
 .\"
-.Dd March 16, 1991
+.Dd June 5, 1993
 .Dt STICKY 8
 .Os BSD 4
 .Sh NAME
diff --git a/share/man/man8/yp.8 b/share/man/man8/yp.8
index f6b57d5fd581..95558fa56229 100644
--- a/share/man/man8/yp.8
+++ b/share/man/man8/yp.8
@@ -1,3 +1,4 @@
+.\"	$NetBSD: yp.8,v 1.7 1994/11/30 19:36:28 jtc Exp $
 .\"
 .\" Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
 .\" All rights reserved.
@@ -27,9 +28,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)yp.8	1.0 (deraadt) 4/26/93
-.\"	$Id: yp.8,v 1.6 1994/11/14 06:30:36 deraadt Exp $
-.\"
 .Dd April 5, 1993
 .Dt YP 8
 .Os