[src/netbsd-1-5]: src Pull up to netbsd-1-5 branch, OK'd by thorpej:

[hubertf <hubertf%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aa0d5966f9b5
branches:  netbsd-1-5
changeset: 489497:aa0d5966f9b5
user:      hubertf <hubertf%NetBSD.org@localhost>
date:      Wed Sep 20 20:21:10 2000 +0000

description:
Pull up to netbsd-1-5 branch, OK'd by thorpej:

Revisions:
 > cvs rdiff -r1.266 -r1.267 basesrc/distrib/sets/lists/man/mi
 > cvs rdiff -r1.34 -r1.35 sharesrc/share/man/man5/Makefile

Log:
 > We now have a wscons.conf(5) manpage.

diffstat:

 distrib/sets/lists/man/mi |  4 +++-
 share/man/man5/Makefile   |  4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r cda0c8d2759f -r aa0d5966f9b5 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Wed Sep 20 20:17:54 2000 +0000
+++ b/distrib/sets/lists/man/mi Wed Sep 20 20:21:10 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.253.2.8 2000/08/13 17:24:39 thorpej Exp $
+# $NetBSD: mi,v 1.253.2.9 2000/09/20 20:21:10 hubertf Exp $
 ./usr/share/info/am-utils.info
 ./usr/share/info/as.info
 ./usr/share/info/awk.info
@@ -707,6 +707,7 @@
 ./usr/share/man/cat5/vgrindefs.0
 ./usr/share/man/cat5/virtual.0
 ./usr/share/man/cat5/weekly.conf.0
+./usr/share/man/cat5/wscons.conf.0
 ./usr/share/man/cat5/wtmp.0
 ./usr/share/man/cat7/ascii.0
 ./usr/share/man/cat7/environ.0
@@ -1739,6 +1740,7 @@
 ./usr/share/man/man5/vgrindefs.5
 ./usr/share/man/man5/virtual.5
 ./usr/share/man/man5/weekly.conf.5
+./usr/share/man/man5/wscons.conf.5
 ./usr/share/man/man5/wtmp.5
 ./usr/share/man/man7/ascii.7
 ./usr/share/man/man7/environ.7
diff -r cda0c8d2759f -r aa0d5966f9b5 share/man/man5/Makefile
--- a/share/man/man5/Makefile   Wed Sep 20 20:17:54 2000 +0000
+++ b/share/man/man5/Makefile   Wed Sep 20 20:21:10 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.32.2.1 2000/09/08 14:07:54 ad Exp $
+#      $NetBSD: Makefile,v 1.32.2.2 2000/09/20 20:21:11 hubertf Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/5/93
 
 # missing: dump.5 plot.5 
@@ -10,7 +10,7 @@
        nsswitch.conf.5 passwd.5 \
        phones.5 printcap.5 protocols.5 ranlib.5 rc.conf.5 remote.5 \
        resolv.conf.5 rpc.5 security.conf.5 services.5 shells.5 stab.5 \
-       ttyaction.5 types.5 utmp.5 weekly.conf.5
+       ttyaction.5 types.5 utmp.5 weekly.conf.5 wscons.conf.5
 MLINKS=        dir.5 dirent.5 fs.5 inode.5 hosts.equiv.5 rhosts.5
 MLINKS+=utmp.5 wtmp.5 utmp.5 lastlog.5 passwd.5 master.passwd.5