From ebd262b28e1f413c8026a06e917c40e93dcf3cb7 Mon Sep 17 00:00:00 2001
From: niklas <niklas@openbsd.org>
Date: Fri, 29 Mar 1996 10:16:00 +0000
Subject: [PATCH] From NetBSD: merge of 960317

---
 share/man/man3/end.3               |  14 +-
 share/man/man4/audio.4             |  39 +++--
 share/man/man4/man4.i386/ast.4     |  11 +-
 share/man/man4/man4.i386/com.4     |  13 +-
 share/man/man4/man4.i386/gus.4     |  39 +++--
 share/man/man4/man4.i386/sb.4      |  43 ++++--
 share/man/man4/man4.vax/Makefile   |   3 +-
 share/man/man4/man4.vax/acc.4      |   4 +-
 share/man/man4/man4.vax/ad.4       |   4 +-
 share/man/man4/man4.vax/autoconf.4 |   4 +-
 share/man/man4/man4.vax/cons.4     |   3 +-
 share/man/man4/man4.vax/crl.4      |   4 +-
 share/man/man4/man4.vax/css.4      |   4 +-
 share/man/man4/man4.vax/ct.4       |   4 +-
 share/man/man4/man4.vax/ddn.4      |   4 +-
 share/man/man4/man4.vax/de.4       |   4 +-
 share/man/man4/man4.vax/dh.4       |   4 +-
 share/man/man4/man4.vax/dhu.4      |  64 ++------
 share/man/man4/man4.vax/dmc.4      |   4 +-
 share/man/man4/man4.vax/dmf.4      |   4 +-
 share/man/man4/man4.vax/dmv.4      |   4 +-
 share/man/man4/man4.vax/dmz.4      |   4 +-
 share/man/man4/man4.vax/dn.4       |   4 +-
 share/man/man4/man4.vax/dz.4       |   4 +-
 share/man/man4/man4.vax/ec.4       |   4 +-
 share/man/man4/man4.vax/en.4       |   4 +-
 share/man/man4/man4.vax/ex.4       |   4 +-
 share/man/man4/man4.vax/fl.4       |   4 +-
 share/man/man4/man4.vax/hdh.4      |   4 +-
 share/man/man4/man4.vax/hk.4       |   4 +-
 share/man/man4/man4.vax/hp.4       | 239 ++---------------------------
 share/man/man4/man4.vax/ht.4       |   4 +-
 share/man/man4/man4.vax/hy.4       |   4 +-
 share/man/man4/man4.vax/ik.4       |   4 +-
 share/man/man4/man4.vax/il.4       |   4 +-
 share/man/man4/man4.vax/intro.4    |   4 +-
 share/man/man4/man4.vax/ix.4       |   4 +-
 share/man/man4/man4.vax/kg.4       |   4 +-
 share/man/man4/man4.vax/lp.4       |   4 +-
 share/man/man4/man4.vax/mem.4      |   4 +-
 share/man/man4/man4.vax/mt.4       |   4 +-
 share/man/man4/man4.vax/mtio.4     |   4 +-
 share/man/man4/man4.vax/np.4       |   4 +-
 share/man/man4/man4.vax/pcl.4      |   4 +-
 share/man/man4/man4.vax/ps.4       |   4 +-
 share/man/man4/man4.vax/qe.4       |   4 +-
 share/man/man4/man4.vax/rx.4       |   4 +-
 share/man/man4/man4.vax/tm.4       |   4 +-
 share/man/man4/man4.vax/tmscp.4    |   4 +-
 share/man/man4/man4.vax/ts.4       |   4 +-
 share/man/man4/man4.vax/tu.4       |  97 ++----------
 share/man/man4/man4.vax/uda.4      |   4 +-
 share/man/man4/man4.vax/up.4       |   4 +-
 share/man/man4/man4.vax/ut.4       |   4 +-
 share/man/man4/man4.vax/uu.4       |   4 +-
 share/man/man4/man4.vax/va.4       |   4 +-
 share/man/man4/man4.vax/vp.4       |   4 +-
 share/man/man4/man4.vax/vv.4       |   4 +-
 share/man/man5/resolv.conf.5       |   5 +-
 share/man/man8/diskless.8          |   5 +-
 share/mk/sys.mk                    |  14 +-
 61 files changed, 294 insertions(+), 483 deletions(-)

diff --git a/share/man/man3/end.3 b/share/man/man3/end.3
index ddb5e5af8e2..57473b360aa 100644
--- a/share/man/man3/end.3
+++ b/share/man/man3/end.3
@@ -1,4 +1,5 @@
-.\"	$NetBSD: end.3,v 1.4 1994/11/30 15:24:33 jtc Exp $
+.\"	$OpenBSD: end.3,v 1.2 1996/03/29 10:16:00 niklas Exp $
+.\"	$NetBSD: end.3,v 1.5 1996/03/01 00:17:49 jtc Exp $
 .\"
 .\" Copyright (c) 1986
 .\"	The Regents of the University of California.  All rights reserved.
@@ -51,14 +52,11 @@ The global variables
 and
 .Va edata
 correspond to the
-the next address following the end
-of the text segment,
-the initialized data segment and the
-end of the data segment
+the next address following 
+the end of the text segment,
+the end of initialized data segment and 
+the end of the data segment
 .Pq Tn BSS .
-These values are initially set at execution time
-by
-.Xr brk 2 .
 .Sh SEE ALSO
 .Xr brk 2 ,
 .Xr malloc 3
diff --git a/share/man/man4/audio.4 b/share/man/man4/audio.4
index 45d70d0c082..a9b7ac020bd 100644
--- a/share/man/man4/audio.4
+++ b/share/man/man4/audio.4
@@ -1,6 +1,12 @@
-.\" Copyright (c) 1995 John T. Kohl
+.\"	$OpenBSD: audio.4,v 1.3 1996/03/29 10:16:04 niklas Exp $
+.\"	$NetBSD: audio.4,v 1.3 1996/02/27 22:42:05 jtc Exp $
+.\"
+.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by John T. Kohl.
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -9,22 +15,25 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"        This product includes software developed by the NetBSD
+.\"        Foundation, Inc. and its contributors.
+.\" 4. Neither the name of The NetBSD Foundation nor the names of its
+.\"    contributors may be used to endorse or promote products derived
+.\"    from this software without specific prior written permission.
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-.\" DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
+.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (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: audio.4,v 1.2 1996/02/22 11:47:21 niklas Exp $
 .\"
 .Dd November 5, 1995
 .Dt AUDIO 4
diff --git a/share/man/man4/man4.i386/ast.4 b/share/man/man4/man4.i386/ast.4
index b68c95269fa..2e61f40325a 100644
--- a/share/man/man4/man4.i386/ast.4
+++ b/share/man/man4/man4.i386/ast.4
@@ -1,3 +1,5 @@
+.\"	$OpenBSD: ast.4,v 1.2 1996/03/29 10:16:07 niklas Exp $
+.\"	$NetBSD: ast.4,v 1.7 1996/03/16 00:07:07 thorpej Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -35,7 +37,6 @@
 .\"
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
 .\"	from: Id: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
-.\"	$Id: ast.4,v 1.1.1.1 1995/10/18 08:44:29 deraadt Exp $
 .\"
 .Dd March 30, 1994
 .Dt AST 4 i386
@@ -46,10 +47,10 @@
 multiplexing serial communications interface
 .Sh SYNOPSIS
 .Cd "ast0 at isa? port 0x1a0 irq 5"
-.Cd "com2 at ast? slave ? flags 1"
-.Cd "com3 at ast? slave ? flags 1"
-.Cd "com4 at ast? slave ? flags 1"
-.Cd "com5 at ast? slave ? flags 1"
+.Cd "com2 at ast? slave ?"
+.Cd "com3 at ast? slave ?"
+.Cd "com4 at ast? slave ?"
+.Cd "com5 at ast? slave ?"
 .Sh DESCRIPTION
 The
 .Nm ast
diff --git a/share/man/man4/man4.i386/com.4 b/share/man/man4/man4.i386/com.4
index 8730d7d13a7..cebdd861d9e 100644
--- a/share/man/man4/man4.i386/com.4
+++ b/share/man/man4/man4.i386/com.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: com.4,v 1.2 1996/03/29 10:16:09 niklas Exp $
+.\"	$NetBSD: com.4,v 1.5 1996/03/16 00:07:08 thorpej Exp $
+.\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -33,7 +36,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
-.\"	$Id: com.4,v 1.1.1.1 1995/10/18 08:44:29 deraadt Exp $
 .\"
 .Dd August 6, 1993
 .Dt COM 4 i386
@@ -45,7 +47,6 @@ serial communications interface
 .Sh SYNOPSIS
 .Cd "com0 at isa? port" \&"IO_COM1\&" irq 4
 .Cd "com1 at isa? port" \&"IO_COM2\&" irq 3
-.Cd "com2 at ast? slave ? flags 1"
 .Sh DESCRIPTION
 The
 .Nm
@@ -61,14 +62,6 @@ Input and output for each line may set to one of following baud rates;
 50, 75, 110, 134.5, 150, 300, 600, 1200, 1800, 2400, 4800, 9600,
 19200, 38400, 57600, or 115200, or any other baud rate which is a factor
 of 115200.
-.Pp
-If
-.Dq flags 1
-is specified, the
-.Nm
-driver will not set the MCR_IENABLE bit on the UART.  This is mainly for
-use on AST multiport boards, where the MCR_IENABLE bit is used to control
-whether or not the devices use a shared interrupt.
 .Sh FILES
 .Bl -tag -width Pa
 .It Pa /dev/tty00
diff --git a/share/man/man4/man4.i386/gus.4 b/share/man/man4/man4.i386/gus.4
index 95f880d3a7b..4990599992b 100644
--- a/share/man/man4/man4.i386/gus.4
+++ b/share/man/man4/man4.i386/gus.4
@@ -1,7 +1,12 @@
-.\"	$NetBSD: gus.4,v 1.1 1995/11/13 14:39:16 pk Exp $
-.\" Copyright (c) 1995 John T. Kohl
+.\"	$OpenBSD: gus.4,v 1.3 1996/03/29 10:16:11 niklas Exp $
+.\"	$NetBSD: gus.4,v 1.2 1996/02/27 22:39:39 jtc Exp $
+.\"
+.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by John T. Kohl.
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -10,21 +15,25 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"        This product includes software developed by the NetBSD
+.\"        Foundation, Inc. and its contributors.
+.\" 4. Neither the name of The NetBSD Foundation nor the names of its
+.\"    contributors may be used to endorse or promote products derived
+.\"    from this software without specific prior written permission.
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-.\" DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
+.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
-.\"	
 .\"
 .Dd November 4, 1995
 .Dt GUS 4 i386
diff --git a/share/man/man4/man4.i386/sb.4 b/share/man/man4/man4.i386/sb.4
index 847821a0d4b..3892ee33b19 100644
--- a/share/man/man4/man4.i386/sb.4
+++ b/share/man/man4/man4.i386/sb.4
@@ -1,7 +1,12 @@
-.\"	$NetBSD: sb.4,v 1.1 1995/11/13 14:39:15 pk Exp $
-.\" Copyright (c) 1995 John T. Kohl
+.\"	$OpenBSD: sb.4,v 1.3 1996/03/29 10:16:12 niklas Exp $
+.\"	$NetBSD: sb.4,v 1.3 1996/02/27 22:39:42 jtc Exp $
+.\"
+.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by John T. Kohl.
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -10,21 +15,25 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"        This product includes software developed by the NetBSD
+.\"        Foundation, Inc. and its contributors.
+.\" 4. Neither the name of The NetBSD Foundation nor the names of its
+.\"    contributors may be used to endorse or promote products derived
+.\"    from this software without specific prior written permission.
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-.\" DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
+.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
-.\"	
 .\"
 .Dd November 4, 1995
 .Dt SB 4 i386
@@ -63,6 +72,6 @@ The FM synthesizer, joystick and MIDI port interfaces are not supported.
 .Xr audio 4
 .Sh HISTORY
 The
-.Nm gus
+.Nm sb
 device driver appeared in
-.Nx 1.1 .
+.Nx 1.0 .
diff --git a/share/man/man4/man4.vax/Makefile b/share/man/man4/man4.vax/Makefile
index ee73ffe37b6..e5fbbebc8cc 100644
--- a/share/man/man4/man4.vax/Makefile
+++ b/share/man/man4/man4.vax/Makefile
@@ -1,5 +1,6 @@
+#	$OpenBSD: Makefile,v 1.2 1996/03/29 10:16:17 niklas Exp $
+#	$NetBSD: Makefile,v 1.6 1996/03/03 17:13:09 thorpej Exp $
 #	from: @(#)Makefile	5.4 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.1.1.1 1995/10/18 08:44:33 deraadt Exp $
 
 MAN=	acc.4 ad.4 autoconf.4 cons.4 crl.4 css.4 ct.4 ddn.4 de.4 dh.4 dhu.4 \
 	dmc.4 dmf.4 dmz.4 dn.4 dz.4 ec.4 en.4 ex.4 fl.4 hdh.4 hk.4 hp.4 \
diff --git a/share/man/man4/man4.vax/acc.4 b/share/man/man4/man4.vax/acc.4
index bf479ddb8b1..71dfd6a0c1a 100644
--- a/share/man/man4/man4.vax/acc.4
+++ b/share/man/man4/man4.vax/acc.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: acc.4,v 1.2 1996/03/29 10:16:19 niklas Exp $
+.\"	$NetBSD: acc.4,v 1.3 1996/03/03 17:13:10 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)acc.4	6.4 (Berkeley) 3/27/91
-.\"	$Id: acc.4,v 1.1.1.1 1995/10/18 08:44:33 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt ACC 4 vax
diff --git a/share/man/man4/man4.vax/ad.4 b/share/man/man4/man4.vax/ad.4
index ad0e05ea04d..2fa65364669 100644
--- a/share/man/man4/man4.vax/ad.4
+++ b/share/man/man4/man4.vax/ad.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: ad.4,v 1.2 1996/03/29 10:16:20 niklas Exp $
+.\"	$NetBSD: ad.4,v 1.3 1996/03/03 17:13:12 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ad.4	6.2 (Berkeley) 3/27/91
-.\"	$Id: ad.4,v 1.1.1.1 1995/10/18 08:44:33 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt AD 4 vax
diff --git a/share/man/man4/man4.vax/autoconf.4 b/share/man/man4/man4.vax/autoconf.4
index 5e108f67fbf..57ec59b7a14 100644
--- a/share/man/man4/man4.vax/autoconf.4
+++ b/share/man/man4/man4.vax/autoconf.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: autoconf.4,v 1.2 1996/03/29 10:16:22 niklas Exp $
+.\"	$NetBSD: autoconf.4,v 1.3 1996/03/03 17:13:13 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)autoconf.4	6.3 (Berkeley) 3/27/91
-.\"	$Id: autoconf.4,v 1.1.1.1 1995/10/18 08:44:33 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt AUTOCONF 4
diff --git a/share/man/man4/man4.vax/cons.4 b/share/man/man4/man4.vax/cons.4
index 0507278bebe..b16da0fd3b5 100644
--- a/share/man/man4/man4.vax/cons.4
+++ b/share/man/man4/man4.vax/cons.4
@@ -1,3 +1,5 @@
+.\"	$OpenBSD: cons.4,v 1.2 1996/03/29 10:16:23 niklas Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +32,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)cons.4	6.3 (Berkeley) 3/27/91
-.\"	$Id: cons.4,v 1.1.1.1 1995/10/18 08:44:33 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt CONS 4 vax
diff --git a/share/man/man4/man4.vax/crl.4 b/share/man/man4/man4.vax/crl.4
index 076597cd746..83fe23caefc 100644
--- a/share/man/man4/man4.vax/crl.4
+++ b/share/man/man4/man4.vax/crl.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: crl.4,v 1.2 1996/03/29 10:16:25 niklas Exp $
+.\"	$NetBSD: crl.4,v 1.3 1996/03/03 17:13:15 thorpej Exp $
+.\"
 .\" Copyright (c) 1986, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)crl.4	6.3 (Berkeley) 3/27/91
-.\"	$Id: crl.4,v 1.1.1.1 1995/10/18 08:44:33 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt CRL 4 vax
diff --git a/share/man/man4/man4.vax/css.4 b/share/man/man4/man4.vax/css.4
index 0cb759a4e73..ff87af8b608 100644
--- a/share/man/man4/man4.vax/css.4
+++ b/share/man/man4/man4.vax/css.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: css.4,v 1.2 1996/03/29 10:16:26 niklas Exp $
+.\"	$NetBSD: css.4,v 1.3 1996/03/03 17:13:16 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)css.4	6.2 (Berkeley) 3/27/91
-.\"	$Id: css.4,v 1.1.1.1 1995/10/18 08:44:33 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt CSS 4 vax
diff --git a/share/man/man4/man4.vax/ct.4 b/share/man/man4/man4.vax/ct.4
index 355e6cbeb2e..1bba4bd16d4 100644
--- a/share/man/man4/man4.vax/ct.4
+++ b/share/man/man4/man4.vax/ct.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: ct.4,v 1.2 1996/03/29 10:16:28 niklas Exp $
+.\"	$NetBSD: ct.4,v 1.3 1996/03/03 17:13:17 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ct.4	6.3 (Berkeley) 3/27/91
-.\"	$Id: ct.4,v 1.1.1.1 1995/10/18 08:44:33 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt CT 4 vax
diff --git a/share/man/man4/man4.vax/ddn.4 b/share/man/man4/man4.vax/ddn.4
index 2575f6fa785..cb0e5a76ef6 100644
--- a/share/man/man4/man4.vax/ddn.4
+++ b/share/man/man4/man4.vax/ddn.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: ddn.4,v 1.2 1996/03/29 10:16:30 niklas Exp $
+.\"	$NetBSD: ddn.4,v 1.3 1996/03/03 17:13:18 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ddn.4	6.5 (Berkeley) 3/27/91
-.\"	$Id: ddn.4,v 1.1.1.1 1995/10/18 08:44:33 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt DDN 4 vax
diff --git a/share/man/man4/man4.vax/de.4 b/share/man/man4/man4.vax/de.4
index 39ea38f9228..03dbc61ff79 100644
--- a/share/man/man4/man4.vax/de.4
+++ b/share/man/man4/man4.vax/de.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: de.4,v 1.2 1996/03/29 10:16:31 niklas Exp $
+.\"	$NetBSD: de.4,v 1.3 1996/03/03 17:13:19 thorpej Exp $
+.\"
 .\" Copyright (c) 1986, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)de.4	6.5 (Berkeley) 3/27/91
-.\"	$Id: de.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt DE 4 vax
diff --git a/share/man/man4/man4.vax/dh.4 b/share/man/man4/man4.vax/dh.4
index 4996828d92c..802dec06c9e 100644
--- a/share/man/man4/man4.vax/dh.4
+++ b/share/man/man4/man4.vax/dh.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: dh.4,v 1.2 1996/03/29 10:16:33 niklas Exp $
+.\"	$NetBSD: dh.4,v 1.3 1996/03/03 17:13:20 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)dh.4	6.3 (Berkeley) 3/27/91
-.\"	$Id: dh.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt DH 4 vax
diff --git a/share/man/man4/man4.vax/dhu.4 b/share/man/man4/man4.vax/dhu.4
index 71a1defd1dc..2f6ba77fbed 100644
--- a/share/man/man4/man4.vax/dhu.4
+++ b/share/man/man4/man4.vax/dhu.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: dhu.4,v 1.2 1996/03/29 10:16:35 niklas Exp $
+.\"	$NetBSD: dhu.4,v 1.4 1996/03/05 15:28:48 ragge Exp $
+.\"
 .\" Copyright (c) 1985, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)dhu.4	6.3 (Berkeley) 3/27/91
-.\"	$Id: dhu.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt DHU 4 vax
@@ -38,32 +40,15 @@
 .Sh NAME
 .Nm dhu
 .Nd
-.Tn DHU-11
+.Tn DHU-11/DHV-11
 communications multiplexer
 .Sh SYNOPSIS
-.Cd "device dhu0 at uba0 csr 0160440 vector dhurint dhuxint"
+.Cd "dhu0 at uba0 csr 0160440"
 .Sh DESCRIPTION
 A
 .Tn DHU-11
 provides 16 communication lines.
 .Pp
-An optional argument
-.Ar flags
-may be supplied with the device specification
-in the config file indicating
-that the line corresponding to
-bit number
-.Ar i
-is not properly
-connected, and should be treated as hard-wired with carrier
-always present.  Thus specifying
-.Ql flags 0x0004
-for
-.Li dhu0
-would cause line
-.Pa ttyS2
-to be treated in this way.
-.Pp
 Normal I/O
 control parameters for individual lines are managed by
 .Xr ioctl 2
@@ -80,7 +65,7 @@ or may be communicated by other programs which
 utilize
 .Xr ioctl
 such as
-.Xr ifcongif 8 ,
+.Xr ifconfig 8 ,
 see
 .Xr tty 4 .
 .Pp
@@ -93,33 +78,6 @@ rather than taking an interrupt on each input character.
 .Bl -tag -width /dev/tty[S-Z][0-9a-f]xx -compact
 .It Pa /dev/tty[S-Z][0-9a-f]
 .El
-.Sh DIAGNOSTICS
-.Bl -diag
-.It dhu(%d,%d): NXM fault.
-No response from
-.Tn UNIBUS
-on a
-.Tn DMA
-transfer
-within a timeout period.  This is often followed by a
-.Tn UNIBUS
-adapter
-error.  This occurs most frequently when the
-.Tn UNIBUS
-is heavily loaded
-and when devices which hog the bus (such as
-.Tn RK07 Ns s )
-are present.
-It is not serious.
-.Pp
-.It dhu%d: silo overflow.
-The character input silo overflowed
-before it could be serviced.  This can happen if a hard error occurs
-when the
-.Tn CPU
-is running with elevated priority, as the system may
-then print a message on the console with interrupts disabled.
-.El
 .Sh NOTES
 The driver currently does not make full use of the hardware
 capabilities of the
@@ -144,3 +102,13 @@ The
 .Nm
 driver appeared in
 .Bx 4.3 .
+.br
+A new
+.Nm
+driver showed up in NetBSD 1.1A.
+.Sh BUGS
+Even if the
+.Nm
+hardware supports
+.Tn DMA,
+the driver cannot make use of this capability.
diff --git a/share/man/man4/man4.vax/dmc.4 b/share/man/man4/man4.vax/dmc.4
index 5bc980331f5..578fe6790d1 100644
--- a/share/man/man4/man4.vax/dmc.4
+++ b/share/man/man4/man4.vax/dmc.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: dmc.4,v 1.2 1996/03/29 10:16:36 niklas Exp $
+.\"	$NetBSD: dmc.4,v 1.3 1996/03/03 17:13:22 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)dmc.4	6.5 (Berkeley) 3/27/91
-.\"	$Id: dmc.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt DMC 4 vax
diff --git a/share/man/man4/man4.vax/dmf.4 b/share/man/man4/man4.vax/dmf.4
index cf1e98b5e3f..a40470795c4 100644
--- a/share/man/man4/man4.vax/dmf.4
+++ b/share/man/man4/man4.vax/dmf.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: dmf.4,v 1.2 1996/03/29 10:16:38 niklas Exp $
+.\"	$NetBSD: dmf.4,v 1.3 1996/03/03 17:13:23 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)dmf.4	6.5 (Berkeley) 3/27/91
-.\"	$Id: dmf.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt DMF 4 vax
diff --git a/share/man/man4/man4.vax/dmv.4 b/share/man/man4/man4.vax/dmv.4
index 1c0d8ddf9d2..d05097ad3c5 100644
--- a/share/man/man4/man4.vax/dmv.4
+++ b/share/man/man4/man4.vax/dmv.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: dmv.4,v 1.2 1996/03/29 10:16:40 niklas Exp $
+.\"	$NetBSD: dmv.4,v 1.3 1996/03/03 17:13:25 thorpej Exp $
+.\"
 .\" Copyright (c) 1988, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)dmv.4	6.2 (Berkeley) 3/27/91
-.\"	$Id: dmv.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt DMV 4 vax
diff --git a/share/man/man4/man4.vax/dmz.4 b/share/man/man4/man4.vax/dmz.4
index 3e443ba85be..caa4f89dd73 100644
--- a/share/man/man4/man4.vax/dmz.4
+++ b/share/man/man4/man4.vax/dmz.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: dmz.4,v 1.2 1996/03/29 10:16:42 niklas Exp $
+.\"	$NetBSD: dmz.4,v 1.3 1996/03/03 17:13:26 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)dmz.4	6.4 (Berkeley) 3/27/91
-.\"	$Id: dmz.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt DMZ 4 vax
diff --git a/share/man/man4/man4.vax/dn.4 b/share/man/man4/man4.vax/dn.4
index eb9569a51b8..6d354b38f55 100644
--- a/share/man/man4/man4.vax/dn.4
+++ b/share/man/man4/man4.vax/dn.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: dn.4,v 1.2 1996/03/29 10:16:43 niklas Exp $
+.\"	$NetBSD: dn.4,v 1.3 1996/03/03 17:13:28 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)dn.4	6.2 (Berkeley) 3/27/91
-.\"	$Id: dn.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt DN 4 vax
diff --git a/share/man/man4/man4.vax/dz.4 b/share/man/man4/man4.vax/dz.4
index 833f8bc520c..082b2a65d1c 100644
--- a/share/man/man4/man4.vax/dz.4
+++ b/share/man/man4/man4.vax/dz.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: dz.4,v 1.2 1996/03/29 10:16:46 niklas Exp $
+.\"	$NetBSD: dz.4,v 1.3 1996/03/03 17:13:29 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)dz.4	6.3 (Berkeley) 3/27/91
-.\"	$Id: dz.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt DZ 4 vax
diff --git a/share/man/man4/man4.vax/ec.4 b/share/man/man4/man4.vax/ec.4
index 92d7f7bb4d0..c985aa3cbe9 100644
--- a/share/man/man4/man4.vax/ec.4
+++ b/share/man/man4/man4.vax/ec.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: ec.4,v 1.2 1996/03/29 10:16:48 niklas Exp $
+.\"	$NetBSD: ec.4,v 1.3 1996/03/03 17:13:30 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ec.4	6.7 (Berkeley) 3/27/91
-.\"	$Id: ec.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt EC 4 vax
diff --git a/share/man/man4/man4.vax/en.4 b/share/man/man4/man4.vax/en.4
index 4d8fa9be4b3..54109392ae8 100644
--- a/share/man/man4/man4.vax/en.4
+++ b/share/man/man4/man4.vax/en.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: en.4,v 1.2 1996/03/29 10:16:49 niklas Exp $
+.\"	$NetBSD: en.4,v 1.3 1996/03/03 17:13:32 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)en.4	6.5 (Berkeley) 3/27/91
-.\"	$Id: en.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt EN 4 vax
diff --git a/share/man/man4/man4.vax/ex.4 b/share/man/man4/man4.vax/ex.4
index bb403c0daf7..65131ae05ca 100644
--- a/share/man/man4/man4.vax/ex.4
+++ b/share/man/man4/man4.vax/ex.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: ex.4,v 1.2 1996/03/29 10:16:51 niklas Exp $
+.\"	$NetBSD: ex.4,v 1.3 1996/03/03 17:13:33 thorpej Exp $
+.\"
 .\" Copyright (c) 1986, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ex.4	6.6 (Berkeley) 3/27/91
-.\"	$Id: ex.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt EX 4 vax
diff --git a/share/man/man4/man4.vax/fl.4 b/share/man/man4/man4.vax/fl.4
index 3de421db9a4..5b44670dfe2 100644
--- a/share/man/man4/man4.vax/fl.4
+++ b/share/man/man4/man4.vax/fl.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: fl.4,v 1.2 1996/03/29 10:16:53 niklas Exp $
+.\"	$NetBSD: fl.4,v 1.3 1996/03/03 17:13:35 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fl.4	6.3 (Berkeley) 3/27/91
-.\"	$Id: fl.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt FL 4 vax
diff --git a/share/man/man4/man4.vax/hdh.4 b/share/man/man4/man4.vax/hdh.4
index b285b52d50f..30aeef7a9a2 100644
--- a/share/man/man4/man4.vax/hdh.4
+++ b/share/man/man4/man4.vax/hdh.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: hdh.4,v 1.2 1996/03/29 10:16:54 niklas Exp $
+.\"	$NetBSD: hdh.4,v 1.3 1996/03/03 17:13:36 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)hdh.4	6.4 (Berkeley) 3/27/91
-.\"	$Id: hdh.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt HDH 4 vax
diff --git a/share/man/man4/man4.vax/hk.4 b/share/man/man4/man4.vax/hk.4
index e9b2d694e4e..b580edad3f5 100644
--- a/share/man/man4/man4.vax/hk.4
+++ b/share/man/man4/man4.vax/hk.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: hk.4,v 1.2 1996/03/29 10:16:55 niklas Exp $
+.\"	$NetBSD: hk.4,v 1.3 1996/03/03 17:13:37 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)hk.4	6.4 (Berkeley) 3/27/91
-.\"	$Id: hk.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt HK 4
diff --git a/share/man/man4/man4.vax/hp.4 b/share/man/man4/man4.vax/hp.4
index eb4f6f54a46..5fb19b5ea6b 100644
--- a/share/man/man4/man4.vax/hp.4
+++ b/share/man/man4/man4.vax/hp.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: hp.4,v 1.2 1996/03/29 10:16:57 niklas Exp $
+.\"	$NetBSD: hp.4,v 1.4 1996/03/05 15:28:50 ragge Exp $
+.\"
 .\" Copyright (c) 1980,1988, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)hp.4	6.5 (Berkeley) 3/27/91
-.\"	$Id: hp.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt HP 4 vax
@@ -41,17 +43,14 @@
 .Tn MASSBUS
 disk interface
 .Sh SYNOPSIS
-.Cd "disk hp0 at mba0 drive 0"
+.Cd "hp0 at mba0 drive 0"
+.Cd "hp* at mba? drive ?"
 .Sh DESCRIPTION
 The
 .Nm hp
 driver
-is a generic Massbus disk driver which handles both the standard
+is a generic Massbus disk driver which handles the standard
 .Tn DEC
-controllers and the Emulex
-.Tn SC750
-and
-.Tn SC780
 controllers.
 It is typical of a block-device disk driver; block
 .Tn I/O
@@ -77,200 +76,13 @@ The label may be updated with
 which can also be used to write-enable and write-disable the sector.
 The next 15 sectors contain a second-stage bootstrap program.
 .Sh DISK SUPPORT
-This driver handles both standard
-.Tn DEC
-controllers and Emulex
-.Tn SC750
-and
-.Tn SC780
-controllers.
 During autoconfiguration or whenever a drive comes on line for the first time,
 or when a drive is opened after all partitions are closed,
 the first sector of the drive is examined for a disk label.
 If a label is found, the geometry of the drive and the partition tables
 are taken from it.
-If no label is found,
-standard
-.Tn DEC
-drive types are
-recognized according to the
-.Tn MASSBUS
-drive type register,
-and default partitions are used.
-For the Emulex controller the drive type register should be configured
-to indicate the drive is an
-.Tn RM02 .
-When this is encountered,
-the driver checks the holding register to find out
-the disk geometry and, based on this information, decides what
-the drive type is.
-.Pp
-Special file names begin with
-.Sq Li hp
-and
-.Sq Li rhp
-for the block and character files respectively. The second
-component of the name, a drive unit number in the range of zero to
-seven, is represented by a
-.Sq Li ?
-in the disk layouts below.
-The last component is the file system partition
-designated
-by a letter from
-.Sq Li a
-to
-.Sq Li h
-and also corresponds to a minor device number set: zero to seven,
-eight to 15, 16 to 23 and so forth for drive zero, drive two and drive
-three respectively.
-The following disks are supported:
-.Tn RM03 ,
-.Tn RM05 ,
-.Tn RP06 ,
-.Tn RM80 ,
-.Tn RP05 ,
-.Tn RP07 ,
-.Tn ML11A ,
-.Tn ML11B ,
-.Tn CDC 9775 ,
-.Tn CDC 9730 ,
-.Tn AMPEX
-Capricorn (32 sectors/track),
-.Tn FUJITSU
-Eagle (48 sectors/track),
-.Tn FUJITSU 2361, 
-and
-.Tn AMPEX
-9300.  The default layout and size (in sectors) of the
-partitions for these drives:
-.Bl -column header diskx undefined length
-.Tn RM03 No partitions
-.Sy	disk	start	length	cyls
-	hp?a	0	15884	0-99
-	hp?b	16000	33440	100-309
-	hp?c	0	131680	0-822
-	hp?d	49600	15884	309-408
-	hp?e	65440	55936	409-758
-	hp?f	121440	10080	759-822
-	hp?g	49600	82080	309-822
-
-.Tn RM05 No partitions
-.Sy	disk	start	length	cyls
-	hp?a	0	15884	0-26
-	hp?b	16416	33440	27-81
-	hp?c	0	500384	0-822
-	hp?d	341696	15884	562-588
-	hp?e	358112	55936	589-680
-	hp?f	414048	86176	681-822
-	hp?g	341696	158528	562-822
-	hp?h	49856	291346	82-561
-
-.Tn RP06 No partitions
-.Sy	disk	start	length	cyls
-	hp?a	0	15884	0-37
-	hp?b	15884	33440	38-117
-	hp?c	0	340670	0-814
-	hp?d	49324	15884	118-155
-	hp?e	65208	55936	156-289
-	hp?f	121220	219296	290-814
-	hp?g	49324	291192	118-814	
-
-.Tn RM80 No partitions
-.Sy	disk	start	length	cyls
-	hp?a	0	15884	0-36
-	hp?b	16058	33440	37-114
-	hp?c	0	242606	0-558
-	hp?d	49910	15884	115-151
-	hp?e	68096	55936	152-280
-	hp?f	125888	120466	281-558
-	hp?g	49910	192510	115-558
-
-.Tn RP05 No partitions
-.Sy	disk	start	length	cyls
-	hp?a	0	15884	0-37
-	hp?b	15884	33440	38-117
-	hp?c	0	171798	0-410
-	hp?d	2242	15884	118-155
-	hp?e	65208	55936	156-289
-	hp?f	121220	50424	290-410
-	hp?g	2242	122320	118-410
-
-.Tn RP07 No partitions
-.Sy	disk	start	length	cyls
-	hp?a	0	15884	0-9
-	hp?b	16000	66880	10-51
-	hp?c	0	1008000	0-629
-	hp?d	376000	15884	235-244
-	hp?e	392000	307200	245-436
-	hp?f	699200	308600	437-629
-	hp?g	376000	631800	235-629
-	hp?h	83200	291346	52-234
-
-.Tn CDC No 9775 partitions
-.Sy	disk	start	length	cyls
-	hp?a	0	15884	0-12
-	hp?b	16640	66880	13-65
-	hp?c	0	1077760	0-841
-	hp?d	376320	15884	294-306
-	hp?e	392960	307200	307-546
-	hp?f	700160	377440	547-841
-	hp?g	376320	701280	294-841
-	hp?h	84480	291346	66-293
-
-.Tn CDC No 9730 partitions
-.Sy	disk	start	length	cyls
-	hp?a	0	15884	0-49
-	hp?b	16000	33440	50-154
-	hp?c	0	263360	0-822
-	hp?d	49600	15884	155-204
-	hp?e	65600	55936	205-379
-	hp?f	121600	141600	380-822
-	hp?g	49600	213600	155-822
-
-.Tn AMPEX No Capricorn partitions
-.Sy	disk	start	length	cyls
-	hp?a	0	15884	0-31
-	hp?b	16384	33440	32-97
-	hp?c	0	524288	0-1023
-	hp?d	342016	15884	668-699
-	hp?e	358400	55936	700-809
-	hp?f	414720	109408	810-1023
-	hp?g	342016	182112	668-1023
-	hp?h	50176	291346	98-667
-
-.Tn FUJITSU No Eagle partitions
-.Sy	disk	start	length	cyls
-	hp?a	0	15884	0-16
-	hp?b	16320	66880	17-86
-	hp?c	0	808320	0-841
-	hp?d	375360	15884	391-407
-	hp?e	391680	55936	408-727
-	hp?f	698880	109248	728-841
-	hp?g	375360	432768	391-841
-	hp?h	83520	291346	87-390
-
-.Tn FUJITSU No 2361 partitions
-.Sy	disk	start	length	cyls
-	hp?a	0	15884	0-12
-	hp?b	16640	66880	13-65
-	hp?c	0	1077760	0-841
-	hp?d	376320	15884	294-306
-	hp?e	392960	307200	307-546
-	hp?f	700160	377408	547-841
-	hp?g	363520	701248	294-841
-	hp?h	84480	291346	66-293
-
-.Tn AMPEX No 9300 partitions
-.Sy	disk	start	length	cyl
-	hp?a	0	15884	0-26
-	hp?b	16416	33440	27-81
-	hp?c	0	495520	0-814
-	hp?d	341696	15884	562-588
-	hp?e	358112	55936	589-680
-	hp?f	414048	81312	681-814
-	hp?g	341696	153664	562-814
-	hp?h	49856	291346	82-561
-.El
+If no label is found, a fake label is created by the driver, enough
+so that a real label can be written.
 .Pp
 The hp?a partition is normally used for the root file system,
 the hp?b partition as a paging area,
@@ -278,9 +90,6 @@ and the hp?c partition for pack-pack copying (it maps the entire disk).
 On disks larger than about 205 Megabytes, the hp?h partition
 is inserted prior to the hp?d or hp?g partition;
 the hp?g partition then maps the remainder of the pack.
-All disk partition tables are calculated using the
-.Xr diskpart 8
-program.
 .Pp
 .Sh FILES
 .Bl -tag -width /dev/rhp[0-7][a-h] -compact
@@ -320,16 +129,6 @@ The error was either unrecoverable, or a large number of retry attempts
 (including offset positioning and drive recalibration) could not
 recover the error.
 .Pp
-.It hp%d: write locked.
-The write protect switch was set on the drive
-when a write was attempted.  The write operation is not recoverable.
-.Pp
-.It hp%d: not ready .
-The drive was spun down or off line when it was
-accessed.  The
-.Tn I/O
-operation is not recoverable.
-.Pp
 .It "hp%d%c: soft ecc reading fsbn %d [of %d-%d] (hp%d bn %d cn %d tn %d sn %d)."
 A recoverable
 .Tn ECC
@@ -345,20 +144,6 @@ this the sectors where the errors are occurring should be checked to see
 if certain cylinders on the pack, spots on the carriage of the drive
 or heads are indicated.
 .Pp
-.It hp%d: 9775 (direct).
-.It hp%d: 9730 (direct).
-.It hp%d: 9300.
-.It hp%d: 9762.
-.It hp%d: capricorn.
-.It hp%d: eagle.
-.It hp%d: 2361.
-.It hp%d: ntracks %d, nsectors %d: unknown device.
-During autoconfiguration one of the above messages may appear
-on the console indicating the appropriate drive type was recognized.
-The last message indicates the drive is of a unknown type.
-In this case, the correct geometry is set, and one partition is created
-that contains the entire drive.
-.Pp
 .El
 .Sh SEE ALSO
 .Xr physio 4 ,
@@ -372,8 +157,16 @@ The
 .Nm
 driver appeared in
 .Bx 4.0 .
+.br
+A new
+.Nm
+driver showed up in NetBSD 1.1A.
 .Sh BUGS
 .Tn DEC Ns -standard
+.Xr bad144 8
+bad-block handling should be used.
+.Pp
+.Tn DEC Ns -standard
 error logging should be supported.
 .Pp
 A program to analyze the logged error information (even in its
diff --git a/share/man/man4/man4.vax/ht.4 b/share/man/man4/man4.vax/ht.4
index 3ba9670a8a1..bf7eecad68c 100644
--- a/share/man/man4/man4.vax/ht.4
+++ b/share/man/man4/man4.vax/ht.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: ht.4,v 1.2 1996/03/29 10:16:59 niklas Exp $
+.\"	$NetBSD: ht.4,v 1.3 1996/03/03 17:13:39 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ht.4	6.3 (Berkeley) 3/27/91
-.\"	$Id: ht.4,v 1.1.1.1 1995/10/18 08:44:34 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt HT 4 vax
diff --git a/share/man/man4/man4.vax/hy.4 b/share/man/man4/man4.vax/hy.4
index e97a0e5a8cc..6c35a826615 100644
--- a/share/man/man4/man4.vax/hy.4
+++ b/share/man/man4/man4.vax/hy.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: hy.4,v 1.2 1996/03/29 10:17:00 niklas Exp $
+.\"	$NetBSD: hy.4,v 1.3 1996/03/03 17:13:41 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)hy.4	6.4 (Berkeley) 3/27/91
-.\"	$Id: hy.4,v 1.1.1.1 1995/10/18 08:44:35 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt HY 4 vax
diff --git a/share/man/man4/man4.vax/ik.4 b/share/man/man4/man4.vax/ik.4
index b4077df6bcc..2e2dd015ac3 100644
--- a/share/man/man4/man4.vax/ik.4
+++ b/share/man/man4/man4.vax/ik.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: ik.4,v 1.2 1996/03/29 10:17:02 niklas Exp $
+.\"	$NetBSD: ik.4,v 1.3 1996/03/03 17:13:42 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ik.4	6.2 (Berkeley) 3/27/91
-.\"	$Id: ik.4,v 1.1.1.1 1995/10/18 08:44:35 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt IK 4 vax
diff --git a/share/man/man4/man4.vax/il.4 b/share/man/man4/man4.vax/il.4
index 27d61ee02f1..f4bf6744463 100644
--- a/share/man/man4/man4.vax/il.4
+++ b/share/man/man4/man4.vax/il.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: il.4,v 1.2 1996/03/29 10:17:04 niklas Exp $
+.\"	$NetBSD: il.4,v 1.3 1996/03/03 17:13:43 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)il.4	6.7 (Berkeley) 3/27/91
-.\"	$Id: il.4,v 1.1.1.1 1995/10/18 08:44:35 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt IL 4 vax
diff --git a/share/man/man4/man4.vax/intro.4 b/share/man/man4/man4.vax/intro.4
index d4f1108c534..e5184009d11 100644
--- a/share/man/man4/man4.vax/intro.4
+++ b/share/man/man4/man4.vax/intro.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: intro.4,v 1.2 1996/03/29 10:17:06 niklas Exp $
+.\"	$NetBSD: intro.4,v 1.3 1996/03/03 17:13:44 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)intro.4	6.6 (Berkeley) 3/27/91
-.\"	$Id: intro.4,v 1.1.1.1 1995/10/18 08:44:35 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt INTRO 4 vax
diff --git a/share/man/man4/man4.vax/ix.4 b/share/man/man4/man4.vax/ix.4
index 580cbcce76b..5efe7ff47bd 100644
--- a/share/man/man4/man4.vax/ix.4
+++ b/share/man/man4/man4.vax/ix.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: ix.4,v 1.2 1996/03/29 10:17:08 niklas Exp $
+.\"	$NetBSD: ix.4,v 1.3 1996/03/03 17:13:45 thorpej Exp $
+.\"
 .\" Copyright (c) 1986, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ix.4	6.5 (Berkeley) 3/27/91
-.\"	$Id: ix.4,v 1.1.1.1 1995/10/18 08:44:35 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt IX 4 vax
diff --git a/share/man/man4/man4.vax/kg.4 b/share/man/man4/man4.vax/kg.4
index eb51d0856f7..ffc095afc67 100644
--- a/share/man/man4/man4.vax/kg.4
+++ b/share/man/man4/man4.vax/kg.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: kg.4,v 1.2 1996/03/29 10:17:09 niklas Exp $
+.\"	$NetBSD: kg.4,v 1.3 1996/03/03 17:13:46 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)kg.4	6.2 (Berkeley) 3/27/91
-.\"	$Id: kg.4,v 1.1.1.1 1995/10/18 08:44:35 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt KG 4 vax
diff --git a/share/man/man4/man4.vax/lp.4 b/share/man/man4/man4.vax/lp.4
index bd89234ebe3..2ebc6634022 100644
--- a/share/man/man4/man4.vax/lp.4
+++ b/share/man/man4/man4.vax/lp.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: lp.4,v 1.2 1996/03/29 10:17:11 niklas Exp $
+.\"	$NetBSD: lp.4,v 1.3 1996/03/03 17:13:48 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)lp.4	6.2 (Berkeley) 3/27/91
-.\"	$Id: lp.4,v 1.1.1.1 1995/10/18 08:44:35 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt LP 4 vax
diff --git a/share/man/man4/man4.vax/mem.4 b/share/man/man4/man4.vax/mem.4
index ebd73cfabf1..5e096a9e08f 100644
--- a/share/man/man4/man4.vax/mem.4
+++ b/share/man/man4/man4.vax/mem.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: mem.4,v 1.2 1996/03/29 10:17:12 niklas Exp $
+.\"	$NetBSD: mem.4,v 1.3 1996/03/03 17:13:50 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)mem.4	6.3 (Berkeley) 3/27/91
-.\"	$Id: mem.4,v 1.1.1.1 1995/10/18 08:44:35 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt MEM 4 vax
diff --git a/share/man/man4/man4.vax/mt.4 b/share/man/man4/man4.vax/mt.4
index b2b1651d448..ccc3bf13243 100644
--- a/share/man/man4/man4.vax/mt.4
+++ b/share/man/man4/man4.vax/mt.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: mt.4,v 1.2 1996/03/29 10:17:15 niklas Exp $
+.\"	$NetBSD: mt.4,v 1.3 1996/03/03 17:13:52 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)mt.4	6.4 (Berkeley) 3/27/91
-.\"	$Id: mt.4,v 1.1.1.1 1995/10/18 08:44:35 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt MT 4 vax
diff --git a/share/man/man4/man4.vax/mtio.4 b/share/man/man4/man4.vax/mtio.4
index adb77b5d258..6eabb3c6eb2 100644
--- a/share/man/man4/man4.vax/mtio.4
+++ b/share/man/man4/man4.vax/mtio.4
@@ -1,4 +1,6 @@
-.\"	$NetBSD: mtio.4,v 1.3 1996/01/07 20:11:35 ragge Exp $
+.\"	$OpenBSD: mtio.4,v 1.3 1996/03/29 10:17:16 niklas Exp $
+.\"	$NetBSD: mtio.4,v 1.4 1996/03/03 17:13:54 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
diff --git a/share/man/man4/man4.vax/np.4 b/share/man/man4/man4.vax/np.4
index a0528c238a7..a7f24ee12b0 100644
--- a/share/man/man4/man4.vax/np.4
+++ b/share/man/man4/man4.vax/np.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: np.4,v 1.2 1996/03/29 10:17:18 niklas Exp $
+.\"	$NetBSD: np.4,v 1.3 1996/03/03 17:13:55 thorpej Exp $
+.\"
 .\" Copyright (c) 1986, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)np.4	6.6 (Berkeley) 3/27/91
-.\"	$Id: np.4,v 1.1.1.1 1995/10/18 08:44:35 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt NP 4 vax
diff --git a/share/man/man4/man4.vax/pcl.4 b/share/man/man4/man4.vax/pcl.4
index 16a9c5c9239..25b4ea07c39 100644
--- a/share/man/man4/man4.vax/pcl.4
+++ b/share/man/man4/man4.vax/pcl.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: pcl.4,v 1.2 1996/03/29 10:17:19 niklas Exp $
+.\"	$NetBSD: pcl.4,v 1.3 1996/03/03 17:13:57 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)pcl.4	6.3 (Berkeley) 3/27/91
-.\"	$Id: pcl.4,v 1.1.1.1 1995/10/18 08:44:35 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt PCL 4 vax
diff --git a/share/man/man4/man4.vax/ps.4 b/share/man/man4/man4.vax/ps.4
index d86accb74b7..3a46f2cc76c 100644
--- a/share/man/man4/man4.vax/ps.4
+++ b/share/man/man4/man4.vax/ps.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: ps.4,v 1.2 1996/03/29 10:17:21 niklas Exp $
+.\"	$NetBSD: ps.4,v 1.3 1996/03/03 17:13:59 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ps.4	6.4 (Berkeley) 3/27/91
-.\"	$Id: ps.4,v 1.1.1.1 1995/10/18 08:44:35 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt PS 4 vax
diff --git a/share/man/man4/man4.vax/qe.4 b/share/man/man4/man4.vax/qe.4
index 96dbd4de871..58813aaabef 100644
--- a/share/man/man4/man4.vax/qe.4
+++ b/share/man/man4/man4.vax/qe.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: qe.4,v 1.2 1996/03/29 10:17:23 niklas Exp $
+.\"	$NetBSD: qe.4,v 1.3 1996/03/03 17:14:01 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)qe.4	6.4 (Berkeley) 3/27/91
-.\"	$Id: qe.4,v 1.1.1.1 1995/10/18 08:44:35 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt QE 4 vax
diff --git a/share/man/man4/man4.vax/rx.4 b/share/man/man4/man4.vax/rx.4
index 4aaec74766b..36de9d27959 100644
--- a/share/man/man4/man4.vax/rx.4
+++ b/share/man/man4/man4.vax/rx.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: rx.4,v 1.2 1996/03/29 10:17:24 niklas Exp $
+.\"	$NetBSD: rx.4,v 1.3 1996/03/03 17:14:03 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rx.4	6.2 (Berkeley) 3/27/91
-.\"	$Id: rx.4,v 1.1.1.1 1995/10/18 08:44:35 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt RX 4 vax
diff --git a/share/man/man4/man4.vax/tm.4 b/share/man/man4/man4.vax/tm.4
index 697c0259712..69ffe1ba958 100644
--- a/share/man/man4/man4.vax/tm.4
+++ b/share/man/man4/man4.vax/tm.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: tm.4,v 1.2 1996/03/29 10:17:26 niklas Exp $
+.\"	$NetBSD: tm.4,v 1.3 1996/03/03 17:14:04 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)tm.4	6.3 (Berkeley) 3/27/91
-.\"	$Id: tm.4,v 1.1.1.1 1995/10/18 08:44:35 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt TM 4 vax
diff --git a/share/man/man4/man4.vax/tmscp.4 b/share/man/man4/man4.vax/tmscp.4
index 3601e8fa933..a72229c4216 100644
--- a/share/man/man4/man4.vax/tmscp.4
+++ b/share/man/man4/man4.vax/tmscp.4
@@ -1,4 +1,6 @@
-.\"	$NetBSD: tmscp.4,v 1.3 1996/01/07 20:56:59 ragge Exp $
+.\"	$OpenBSD: tmscp.4,v 1.3 1996/03/29 10:17:27 niklas Exp $
+.\"	$NetBSD: tmscp.4,v 1.4 1996/03/03 17:14:06 thorpej Exp $
+.\"
 .\" Copyright (c) 1986, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
diff --git a/share/man/man4/man4.vax/ts.4 b/share/man/man4/man4.vax/ts.4
index 3b4f5f7e68c..c1f599069d2 100644
--- a/share/man/man4/man4.vax/ts.4
+++ b/share/man/man4/man4.vax/ts.4
@@ -1,4 +1,6 @@
-.\"	$NetBSD: ts.4,v 1.3 1996/01/07 20:48:19 ragge Exp $
+.\"	$OpenBSD: ts.4,v 1.3 1996/03/29 10:17:29 niklas Exp $
+.\"	$NetBSD: ts.4,v 1.4 1996/03/03 17:14:08 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
diff --git a/share/man/man4/man4.vax/tu.4 b/share/man/man4/man4.vax/tu.4
index fd2ec82cfbc..51e5bbccb4a 100644
--- a/share/man/man4/man4.vax/tu.4
+++ b/share/man/man4/man4.vax/tu.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: tu.4,v 1.2 1996/03/29 10:17:31 niklas Exp $
+.\"	$NetBSD: tu.4,v 1.4 1996/03/03 17:14:09 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)tu.4	6.2 (Berkeley) 3/27/91
-.\"	$Id: tu.4,v 1.1.1.1 1995/10/18 08:44:36 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt TU 4 vax
@@ -38,27 +40,17 @@
 .Sh NAME
 .Nm tu
 .Nd
-.Tn VAX-11/730
-and
 .Tn VAX-11/750
 .Tn TU58
 console cassette interface
-.Sh SYNOPSIS
-.Cd "options MRSP"
-(for
-.Tn VAX-11/750 Ns 's
-with an
-.Tn MRSP
-prom)
 .Sh DESCRIPTION
 The
 .Nm tu
 interface provides access to the
 .Tn VAX
-11/730 and 11/750
+11/750
 .Tn TU58
-console
-cassette drive(s).  
+console cassette drive.  
 .Pp
 The interface supports only block
 .Tn I/O
@@ -66,11 +58,11 @@ to the
 .Tn TU58
 cassettes.
 The devices are normally manipulated with the 
-.Xr arff 8
-program using the ``f'' and ``m'' options.
+.Xr dd 1
+program.
 .Pp
 The device driver is automatically included when a
-system is configured to run on an 11/730 or 11/750.
+system is configured to run on an 11/750.
 .Pp
 The
 .Tn TU58
@@ -78,89 +70,30 @@ on an 11/750 uses the Radial Serial Protocol
 .Pq Tn RSP
 to communicate with the cpu over a serial line.  This 
 protocol is inherently unreliable as it has no flow
-control measures built in.  On an 11/730 the Modified
-Radial Serial Protocol is used.  This protocol incorporates
-flow control measures which insure reliable data transfer
-between the cpu and the device.  Certain 11/750's have
-been modified to use the
-.Tn MRSP
-prom used in the 11/730.
-To reliably use the console
-.Tn TU58
-on an 11/750 under
-.Tn UNIX ,
-the
-.Tn MRSP
-prom is required.  For those 11/750's without
-an
-.Tn MRSP
-prom, an unreliable but often
-useable interface has been developed.
-This interface uses an assembly language ``pseudo-dma'' routine
-to minimize the receiver interrupt service latency.
-To include this code in
-the system, the configuration must
-.Em not
-specify the
-system will run on an 11/730 or use an
-.Tn MRSP
-prom.
-This unfortunately makes it impossible to configure a
-single system which will properly handle
-.Tn TU58 Ns 's
-on both an 11/750
-and an 11/730 (unless both machines have
-.Tn MRSP
-proms).
+control measures built in.
 .Sh FILES
 .Bl -tag -width /dev/tu0xx -compact
 .It Pa /dev/tu0
-.It Pa /dev/tu1
-(only on a
-.Tn VAX Ns \-11/730)
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
-.It tu%d: no bp, active %d.
-A transmission complete interrupt was received with no outstanding
-.Tn I/O
-request.  This indicates a hardware problem.
-.Pp
-.It "tu%d protocol error, state=%s, op=%x, cnt=%d, block=%d."
-The driver entered an illegal state.  The information printed
-indicates the illegal state, operation currently being executed,
-the
-.Tn I/O
-count, and the block number on the cassette.
-.Pp
-.It "tu%d receive state error, state=%s, byte=%x."
-The driver entered an illegal state in the receiver finite
-state machine.  The state is shown along with the control
-byte of the received packet.
-.Pp
-.It tu%d: read stalled.
+.It tu%d: lost recv interrupt.
+.br
 A timer watching the controller detected no interrupt for
 an extended period while an operation was outstanding.
 This usually indicates that one or more receiver interrupts
-were lost and the transfer is restarted (11/750 only).
-.Pp
-.It tu%d: hard error bn%d, pk_mod %o.
-The device returned a status code indicating a hard error. The
-actual error code is shown in octal. No retries are attempted
-by the driver.
+were lost and the transfer is restarted.
 .El
-.Sh SEE ALSO
-.Xr arff 8
 .Sh HISTORY
 The
 .Nm
 driver appeared in
 .Bx 4.1 .
+.br
+A new driver showed up in NetBSD 1.1A.
 .Sh BUGS
 The
 .Tn VAX Ns \-11/750
-console interface without
-.Tn MRSP
-prom is unuseable
+console interface is unuseable
 while the system is multi-user; it should be used only with
 the system running single-user and, even then, with caution.
diff --git a/share/man/man4/man4.vax/uda.4 b/share/man/man4/man4.vax/uda.4
index e496f2455dc..062a9d0a29b 100644
--- a/share/man/man4/man4.vax/uda.4
+++ b/share/man/man4/man4.vax/uda.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: uda.4,v 1.2 1996/03/29 10:17:33 niklas Exp $
+.\"	$NetBSD: uda.4,v 1.3 1996/03/03 17:14:10 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1987, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)uda.4	6.6 (Berkeley) 3/27/91
-.\"	$Id: uda.4,v 1.1.1.1 1995/10/18 08:44:36 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt UDA 4 vax
diff --git a/share/man/man4/man4.vax/up.4 b/share/man/man4/man4.vax/up.4
index 52de6c83a40..26602180f76 100644
--- a/share/man/man4/man4.vax/up.4
+++ b/share/man/man4/man4.vax/up.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: up.4,v 1.2 1996/03/29 10:17:35 niklas Exp $
+.\"	$NetBSD: up.4,v 1.3 1996/03/03 17:14:12 thorpej Exp $
+.\"
 .\" Copyright (c) 1980,1988, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)up.4	6.4 (Berkeley) 3/27/91
-.\"	$Id: up.4,v 1.1.1.1 1995/10/18 08:44:36 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt UP 4 vax
diff --git a/share/man/man4/man4.vax/ut.4 b/share/man/man4/man4.vax/ut.4
index 29f5001e715..ae5893f61b7 100644
--- a/share/man/man4/man4.vax/ut.4
+++ b/share/man/man4/man4.vax/ut.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: ut.4,v 1.2 1996/03/29 10:17:37 niklas Exp $
+.\"	$NetBSD: ut.4,v 1.3 1996/03/03 17:14:13 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ut.4	6.2 (Berkeley) 3/27/91
-.\"	$Id: ut.4,v 1.1.1.1 1995/10/18 08:44:36 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt UT 4 vax
diff --git a/share/man/man4/man4.vax/uu.4 b/share/man/man4/man4.vax/uu.4
index 770163b60b8..783dcf1e168 100644
--- a/share/man/man4/man4.vax/uu.4
+++ b/share/man/man4/man4.vax/uu.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: uu.4,v 1.2 1996/03/29 10:17:39 niklas Exp $
+.\"	$NetBSD: uu.4,v 1.3 1996/03/03 17:14:14 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)uu.4	6.2 (Berkeley) 3/27/91
-.\"	$Id: uu.4,v 1.1.1.1 1995/10/18 08:44:36 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt UU 4 vax
diff --git a/share/man/man4/man4.vax/va.4 b/share/man/man4/man4.vax/va.4
index 2f708747e09..1cfe26f7315 100644
--- a/share/man/man4/man4.vax/va.4
+++ b/share/man/man4/man4.vax/va.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: va.4,v 1.2 1996/03/29 10:17:40 niklas Exp $
+.\"	$NetBSD: va.4,v 1.3 1996/03/03 17:14:15 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)va.4	6.3 (Berkeley) 3/27/91
-.\"	$Id: va.4,v 1.1.1.1 1995/10/18 08:44:36 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt VA 4 vax
diff --git a/share/man/man4/man4.vax/vp.4 b/share/man/man4/man4.vax/vp.4
index 6ee9f73229e..be2beed3233 100644
--- a/share/man/man4/man4.vax/vp.4
+++ b/share/man/man4/man4.vax/vp.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: vp.4,v 1.2 1996/03/29 10:17:42 niklas Exp $
+.\"	$NetBSD: vp.4,v 1.3 1996/03/03 17:14:16 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)vp.4	6.3 (Berkeley) 3/27/91
-.\"	$Id: vp.4,v 1.1.1.1 1995/10/18 08:44:36 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt VP 4 vax
diff --git a/share/man/man4/man4.vax/vv.4 b/share/man/man4/man4.vax/vv.4
index a0fdef24e2e..679beeb1efd 100644
--- a/share/man/man4/man4.vax/vv.4
+++ b/share/man/man4/man4.vax/vv.4
@@ -1,3 +1,6 @@
+.\"	$OpenBSD: vv.4,v 1.2 1996/03/29 10:17:43 niklas Exp $
+.\"	$NetBSD: vv.4,v 1.3 1996/03/03 17:14:18 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -30,7 +33,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)vv.4	6.5 (Berkeley) 3/27/91
-.\"	$Id: vv.4,v 1.1.1.1 1995/10/18 08:44:36 deraadt Exp $
 .\"
 .Dd March 27, 1991
 .Dt VV 4 vax
diff --git a/share/man/man5/resolv.conf.5 b/share/man/man5/resolv.conf.5
index 3de30f557ac..7ac27cc9ebe 100644
--- a/share/man/man5/resolv.conf.5
+++ b/share/man/man5/resolv.conf.5
@@ -1,4 +1,5 @@
-.\"	$NetBSD: resolv.conf.5,v 1.6 1994/12/12 06:13:29 deraadt Exp $
+.\"	$OpenBSD: resolv.conf.5,v 1.2 1996/03/29 10:17:50 niklas Exp $
+.\"	$NetBSD: resolv.conf.5,v 1.7 1996/03/06 18:22:16 scottr Exp $
 .\"
 .\" Copyright (c) 1986, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -137,7 +138,7 @@ and that queries will time out if no server is available
 for one of the domains.
 .Pp
 The search list is currently limited to six domains
-with a total of 256 characters.
+with a total of 1024 characters.
 .It Sy sortlist
 Sortlist allows addresses returned by gethostbyname to
 be sorted.
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index 2e7b350cea6..b6647e3d6e7 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -1,4 +1,5 @@
-.\"	$NetBSD: diskless.8,v 1.6 1995/09/02 17:12:32 thorpej Exp $
+.\"	$OpenBSD: diskless.8,v 1.2 1996/03/29 10:17:52 niklas Exp $
+.\"	$NetBSD: diskless.8,v 1.7 1996/02/18 01:10:55 hpeyerl Exp $
 .\"
 .\"
 .\" Copyright (c) 1994 Gordon W. Ross, Theo de Raadt
@@ -253,7 +254,7 @@ Export the required filesystems in
 # for SunOS:
 # /export/myclient -rw=myclient,root=myclient
 # for NetBSD:
-/export/myclient -maproot=root myclient
+/export/myclient -maproot=root -alldirs myclient
 .Ed
 .Pp
 If the server and client are of the same architecture, then the client
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index b0617abee4f..7447c829928 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,5 +1,5 @@
-#	$OpenBSD: sys.mk,v 1.5 1996/03/09 01:33:31 niklas Exp $
-#	$NetBSD: sys.mk,v 1.22 1995/09/24 23:49:09 christos Exp $
+#	$OpenBSD: sys.mk,v 1.6 1996/03/29 10:17:55 niklas Exp $
+#	$NetBSD: sys.mk,v 1.25 1996/02/29 19:06:57 jtc Exp $
 #	@(#)sys.mk	5.11 (Berkeley) 3/13/91
 
 unix=		We run OpenBSD.
@@ -32,9 +32,7 @@ COMPILE.cc?=	${CXX} ${CXXFLAGS} ${CPPFLAGS} -c
 LINK.cc?=	${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CPP?=		cpp
-.if defined(DESTDIR)
-CPPFLAGS+=	-nostdinc -idirafter ${DESTDIR}/usr/include
-.endif
+CPPFLAGS?=	
 
 FC?=		f77
 FFLAGS?=		-O
@@ -74,10 +72,12 @@ YACC.y?=	${YACC} ${YFLAGS}
 	${LINK.c} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
 .c.o:
 	${COMPILE.c} ${.IMPSRC}
+.if (${MACHINE_ARCH} != "alpha")
 .c.a:
 	${COMPILE.c} ${.IMPSRC}
 	${AR} ${ARFLAGS} $@ $*.o
 	rm -f $*.o
+.endif
 .c.ln:
 	${LINT} ${LINTFLAGS} ${CFLAGS:M-[IDU]*} -i ${.IMPSRC}
 
@@ -142,7 +142,7 @@ YACC.y?=	${YACC} ${YFLAGS}
 .s:
 	${LINK.s} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
 .s.o:
-	${COMPILE.s} ${.IMPSRC}
+	${COMPILE.s} -o ${.TARGET} ${.IMPSRC} 
 .s.a:
 	${COMPILE.s} ${.IMPSRC}
 	${AR} ${ARFLAGS} $@ $*.o
@@ -150,7 +150,7 @@ YACC.y?=	${YACC} ${YFLAGS}
 .S:
 	${LINK.S} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
 .S.o:
-	${COMPILE.S} ${.IMPSRC}
+	${COMPILE.S} -o ${.TARGET} ${.IMPSRC}
 .S.a:
 	${COMPILE.S} ${.IMPSRC}
 	${AR} ${ARFLAGS} $@ $*.o
-- 
2.20.1