o Minor updates from 4.4BSD

o Renamed rd.4 -> hd.4 since OpenBSD calls this device hd, not rd
o Fixed up device sections to matchg config.new
o Added /dev/cua* to FILES sections where sensible
o We don't have an RMP option since rbootd uses bpf
o A few other minor wording fixes

21 files changed, 271 insertions, 498 deletions

diff --git a/share/man/man4/man4.hp300/Makefile b/share/man/man4/man4.hp300/Makefile
index 5f4d7c8c39e..83e19c88a99 100644
--- a/share/man/man4/man4.hp300/Makefile
+++ b/share/man/man4/man4.hp300/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.2 2000/03/02 14:46:45 todd Exp $
+#	$OpenBSD: Makefile,v 1.3 2001/05/11 01:24:19 millert Exp $
 #	from: @(#)Makefile	5.1 (Berkeley) 6/29/90
 
-MAN=	autoconf.4 cons.4 ct.4 dca.4 dcl.4 dcm.4 dv.4 gb.4 grf.4 hil.4 \
-	intro.4 ite.4 le.4 mem.4 ppi.4 rb.4 rd.4 rmp.4 tc.4
+MAN=	autoconf.4 cons.4 ct.4 dca.4 dcl.4 dcm.4 dv.4 gb.4 grf.4 hd.4 hil.4 \
+	intro.4 ite.4 le.4 mem.4 ppi.4 rb.4 tc.4
 MLINKS=	mem.4 kmem.4
 MANSUBDIR=/hp300
 
diff --git a/share/man/man4/man4.hp300/autoconf.4 b/share/man/man4/man4.hp300/autoconf.4
index c7e9877b954..2120ee78225 100644
--- a/share/man/man4/man4.hp300/autoconf.4
+++ b/share/man/man4/man4.hp300/autoconf.4
@@ -1,6 +1,7 @@
-.\"	$OpenBSD: autoconf.4,v 1.2 2000/03/02 14:46:45 todd Exp $
-.\" Copyright (c) 1990, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$OpenBSD: autoconf.4,v 1.3 2001/05/11 01:24:19 millert Exp $
+.\
+.\" Copyright (c) 1990, 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
@@ -30,9 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)autoconf.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)autoconf.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 27, 1991
+.Dd June 9, 1993
 .Dt AUTOCONF 4 hp300
 .Os
 .Sh NAME
@@ -135,8 +136,3 @@ The slave number comes from the address select switches on the interface card.
 .%T 4.3BSD for the HP300
 .%O in the distribution documentation package
 .Re
-.Sh HISTORY
-The
-.Nm autoconf
-feature
-.Ud -beta
diff --git a/share/man/man4/man4.hp300/cons.4 b/share/man/man4/man4.hp300/cons.4
index d5a88dde483..71badd72df9 100644
--- a/share/man/man4/man4.hp300/cons.4
+++ b/share/man/man4/man4.hp300/cons.4
@@ -1,10 +1,12 @@
-.\"	$OpenBSD: cons.4,v 1.3 2000/03/02 14:46:45 todd Exp $
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$OpenBSD: cons.4,v 1.4 2001/05/11 01:24:19 millert Exp $
+.\
+.\" Copyright (c) 1990, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Systems Programming Group of the University of Utah Computer
 .\" Science Department.
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -33,9 +35,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)cons.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)cons.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 27, 1991
+.Dd June 9, 1993
 .Dt CONS 4 hp300
 .Os
 .Sh NAME
@@ -68,11 +70,6 @@ console in that order.
 .Sh SEE ALSO
 .Xr tty 4 ,
 .Xr reboot 8
-.Sh HISTORY
-The
-.Nm
-device
-.Ud
 .Sh BUGS
 You should be able to specify potential console devices at
 .Xr config 8
diff --git a/share/man/man4/man4.hp300/ct.4 b/share/man/man4/man4.hp300/ct.4
index 26ff0691652..b2d813a39fc 100644
--- a/share/man/man4/man4.hp300/ct.4
+++ b/share/man/man4/man4.hp300/ct.4
@@ -1,10 +1,12 @@
-.\"	$OpenBSD: ct.4,v 1.3 2000/03/02 14:46:45 todd Exp $
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$OpenBSD: ct.4,v 1.4 2001/05/11 01:24:19 millert Exp $
+.\
+.\" Copyright (c) 1990, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Systems Programming Group of the University of Utah Computer
 .\" Science Department.
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -33,9 +35,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)ct.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)ct.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 27, 1991
+.Dd June 9, 1993
 .Dt CT 4 hp300
 .Os
 .Sh NAME
@@ -44,7 +46,7 @@
 .Tn CS/80
 cartridge tape interface
 .Sh SYNOPSIS
-.Cd "tape ct0 at hpib? slave ?"
+.Cd "ct* at hpibbus? slave ? punit ?"
 .Sh DESCRIPTION
 The cartridge tape interface as found in the 7912, 7914, 7946, 9144, 9145,
 and 88140 products provides a standard tape drive interface as described in
@@ -100,12 +102,7 @@ refer to streaming no-rewind interfaces.
 .Xr mt 1 ,
 .Xr tar 1 ,
 .Xr tp 1 ,
-.Xr mtio 4 .
-.Sh HISTORY
-The
-.Nm \&ct
-driver
-.Ud
+.Xr mtio 4
 .Sh BUGS
 Read and writes of less than 1024 bytes will not behave as expected.
 The 9145 device is currently treated as a 9144.
diff --git a/share/man/man4/man4.hp300/dca.4 b/share/man/man4/man4.hp300/dca.4
index eb7bda12215..ed621bd8809 100644
--- a/share/man/man4/man4.hp300/dca.4
+++ b/share/man/man4/man4.hp300/dca.4
@@ -1,10 +1,12 @@
-.\"	$OpenBSD: dca.4,v 1.2 2000/03/02 14:46:45 todd Exp $
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$OpenBSD: dca.4,v 1.3 2001/05/11 01:24:19 millert Exp $
+.\
+.\" Copyright (c) 1990, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Systems Programming Group of the University of Utah Computer
 .\" Science Department.
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -33,9 +35,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)dca.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 27, 1991
+.Dd June 9, 1993
 .Dt DCA 4 hp300
 .Os
 .Sh NAME
@@ -44,7 +46,7 @@
 .Tn HP 98644A
 communications interface
 .Sh SYNOPSIS
-.Cd "device dca0 at scode9 flags 0x1"
+.Cd "dca0 at dio? scode 9 flags 1"
 .Sh DESCRIPTION
 The
 .Tn 98644A
@@ -67,6 +69,7 @@ with carrier always present or 0 if modem control is desired.
 .Sh FILES
 .Bl -tag -width Pa
 .It Pa /dev/tty0
+.It Pa /dev/cua0
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
@@ -77,11 +80,6 @@ has overflowed and incoming data has been lost.
 .El
 .Sh SEE ALSO
 .Xr tty 4
-.Sh HISTORY
-The
-.Nm
-driver
-.Ud
 .Sh BUGS
 Data loss is possible on busy systems with baud rates greater than 300.
 The
diff --git a/share/man/man4/man4.hp300/dcl.4 b/share/man/man4/man4.hp300/dcl.4
index 70f93fdb4e0..b99763cae92 100644
--- a/share/man/man4/man4.hp300/dcl.4
+++ b/share/man/man4/man4.hp300/dcl.4
@@ -1,10 +1,12 @@
-.\"	$OpenBSD: dcl.4,v 1.4 2000/03/02 14:46:46 todd Exp $
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$OpenBSD: dcl.4,v 1.5 2001/05/11 01:24:19 millert Exp $
+.\
+.\" Copyright (c) 1990, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Systems Programming Group of the University of Utah Computer
 .\" Science Department.
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -33,9 +35,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)dcl.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)dcl.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 27, 1991
+.Dd June 9, 1993
 .Dt DCL 4 hp300
 .Os
 .Sh NAME
@@ -44,7 +46,7 @@
 .Tn HP
 98628A communications link
 .Sh SYNOPSIS
-.Cd "device dcl0 at scode? flags 0x1"
+.Cd "dcl0 at dio? scode ? flags 1"
 .Sh DESCRIPTION
 The 98628A is a buffered
 .Tn EIA
@@ -91,6 +93,7 @@ than 256 will improve performance marginally.
 .Sh FILES
 .Bl -tag -width /dev/ttyl[0-9] -compact
 .It Pa /dev/ttyl[0-9]
+.It Pa /dev/cual[0-9]
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
@@ -113,13 +116,8 @@ Where the errors are encoded:
 .El
 .Sh SEE ALSO
 .Xr tty 4
-.Sh HISTORY
-The
-.Nm
-driver
-.Ud
 .Sh BUGS
-Breaks received at a faster rate then 1 break every second will be
+Breaks received at a rate faster than 1 break every second will be
 recognized as a single break.
 .Pp
 Console use is not supported.
diff --git a/share/man/man4/man4.hp300/dcm.4 b/share/man/man4/man4.hp300/dcm.4
index 20d0b6b241e..51f63644b8d 100644
--- a/share/man/man4/man4.hp300/dcm.4
+++ b/share/man/man4/man4.hp300/dcm.4
@@ -1,10 +1,12 @@
-.\"	$OpenBSD: dcm.4,v 1.3 2000/03/02 14:46:46 todd Exp $
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$OpenBSD: dcm.4,v 1.4 2001/05/11 01:24:19 millert Exp $
+.\
+.\" Copyright (c) 1990, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Systems Programming Group of the University of Utah Computer
 .\" Science Department.
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -33,9 +35,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)dcm.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)dcm.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 27, 1991
+.Dd June 9, 1993
 .Dt DCM 4 hp300
 .Os
 .Sh NAME
@@ -44,7 +46,7 @@
 .Tn HP
 98642A communications multiplexer
 .Sh SYNOPSIS
-.Cd "device dcm0 at scode? flags 0xe"
+.Cd "dcm* at dio? scode ? flags 0xe"
 .Sh DESCRIPTION
 The
 .Tn 98642A
@@ -80,6 +82,7 @@ the interrupt rate drops.
 .Sh FILES
 .Bl -tag -width /dev/tty0[0-9a-f] -compact
 .It Pa /dev/tty0[0-9a-f]
+.It Pa /dev/cua0[0-9a-f]
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
@@ -93,11 +96,6 @@ overflowed.
 .El
 .Sh SEE ALSO
 .Xr tty 4
-.Sh HISTORY
-The
-.Nm
-driver
-.Ud
 .Sh BUGS
 Total throughput per card, all ports together, is limited to 76800 bits per
 second continuous input rate.
diff --git a/share/man/man4/man4.hp300/dv.4 b/share/man/man4/man4.hp300/dv.4
index 08fa220cdfc..576bcd40070 100644
--- a/share/man/man4/man4.hp300/dv.4
+++ b/share/man/man4/man4.hp300/dv.4
@@ -1,7 +1,7 @@
-.\"	$OpenBSD: dv.4,v 1.3 2000/12/15 14:31:20 aaron Exp $
+.\"	$OpenBSD: dv.4,v 1.4 2001/05/11 01:24:19 millert Exp $
 .\"
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" Copyright (c) 1990, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Systems Programming Group of the University of Utah Computer
@@ -35,9 +35,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)dv.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)dv.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 27, 1991
+.Dd June 9, 1993
 .Dt DV 4 hp300
 .Os
 .Sh NAME
@@ -165,11 +165,6 @@ Invalid ioctl specification.
 .El
 .Sh SEE ALSO
 .Xr ioctl 2 ,
-.Xr grf 4 .
-.Sh HISTORY
-The
-.Nm
-driver
-.Ud
+.Xr grf 4
 .Sh BUGS
 Not tested for all configurations of scan board and frame buffer memory boards.
diff --git a/share/man/man4/man4.hp300/gb.4 b/share/man/man4/man4.hp300/gb.4
index bf73bfc18de..54b05bde87d 100644
--- a/share/man/man4/man4.hp300/gb.4
+++ b/share/man/man4/man4.hp300/gb.4
@@ -1,11 +1,12 @@
-.\"	$OpenBSD: gb.4,v 1.3 2000/12/15 14:31:20 aaron Exp $
+.\"	$OpenBSD: gb.4,v 1.4 2001/05/11 01:24:19 millert Exp $
 .\"
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" Copyright (c) 1990, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Systems Programming Group of the University of Utah Computer
 .\" Science Department.
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -34,9 +35,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)gb.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)gb.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 27, 1991
+.Dd June 9, 1993
 .Dt GB 4 hp300
 .Os
 .Sh NAME
@@ -179,8 +180,3 @@ Invalid ioctl specification.
 .Sh SEE ALSO
 .Xr ioctl 2 ,
 .Xr grf 4
-.Sh HISTORY
-The
-.Nm
-driver
-.Ud
diff --git a/share/man/man4/man4.hp300/grf.4 b/share/man/man4/man4.hp300/grf.4
index 4f362c4b3c5..ae8699bfba6 100644
--- a/share/man/man4/man4.hp300/grf.4
+++ b/share/man/man4/man4.hp300/grf.4
@@ -1,11 +1,12 @@
-.\"	$OpenBSD: grf.4,v 1.4 2000/12/15 14:31:20 aaron Exp $
+.\"	$OpenBSD: grf.4,v 1.5 2001/05/11 01:24:20 millert Exp $
 .\"
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" Copyright (c) 1990, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Systems Programming Group of the University of Utah Computer
 .\" Science Department.
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -34,9 +35,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)grf.4	5.3 (Berkeley) 7/31/91
+.\"     from: @(#)grf.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd July 31, 1991
+.Dd June 9, 1993
 .Dt GRF 4 hp300
 .Os
 .Sh NAME
@@ -208,8 +209,3 @@ Invalid ioctl specification.
 .Xr hil 4 ,
 .Xr rb 4 ,
 .Xr tc 4
-.Sh HISTORY
-The
-.Nm
-driver
-.Ud
diff --git a/share/man/man4/man4.hp300/rd.4 b/share/man/man4/man4.hp300/hd.4
index ea5bef6c6f3..593e601f107 100644
--- a/share/man/man4/man4.hp300/rd.4
+++ b/share/man/man4/man4.hp300/hd.4
@@ -1,10 +1,12 @@
-.\"	$OpenBSD: rd.4,v 1.3 2000/03/02 14:46:46 todd Exp $
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$OpenBSD: hd.4,v 1.1 2001/05/11 01:24:20 millert Exp $
+.\"
+.\" Copyright (c) 1990, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Systems Programming Group of the University of Utah Computer
 .\" Science Department.
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -33,19 +35,18 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)rd.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)rd.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 27, 1991
+.Dd June 9, 1993
 .Dt RD 4 hp300
 .Os
 .Sh NAME
-.Nm rd
+.Nm hd
 .Nd
 .Tn CS/80
 disk interface
 .Sh SYNOPSIS
-.Cd "master hpib? at scode?"
-.Cd "disk rd? at hpib? slave?"
+.Cd "hd* at hpibbus? slave ? punit ?"
 .Sh DESCRIPTION
 This is a generic
 .Tn CS/80
@@ -60,7 +61,7 @@ It is a typical block-device driver; see
 The script
 .Xr MAKEDEV 8
 should be used to create the
-.Nm rd
+.Nm hd
 special files; consult
 .Xr mknod 8
 if a special file needs to be made manually.
@@ -76,9 +77,9 @@ The driver recognizes the following drives:
 and 9122,
 not all of which have been tested.
 Special file names begin with
-.Sq Li rd
+.Sq Li hd
 and
-.Sq Li rrd
+.Sq Li rhd
 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
@@ -99,157 +100,157 @@ partitions for these drives:
 .Bl -column header diskx undefined length
 .Tn 7945/7946 No partitions:
 .Sy	disk	start	length	cyls
-	rd?a	112	15904	1-142
-	rd?b	16016	20160	143-322
-	rd?c	0	108416	0-967
-	rd?d	16016	40320	143-502
-	rd?e	undefined
-	rd?f	undefined
-	rd?g	36176	72240	323-967
-	rd?h	56336	52080	503-967
+	hd?a	112	15904	1-142
+	hd?b	16016	20160	143-322
+	hd?c	0	108416	0-967
+	hd?d	16016	40320	143-502
+	hd?e	undefined
+	hd?f	undefined
+	hd?g	36176	72240	323-967
+	hd?h	56336	52080	503-967
 
 .Tn 9134D No partitions:
 .Sy	disk	start	length	cyls
-	rd?a	96	15936	1-166
-	rd?b	16032	13056	167-302
-	rd?c	0	29088	0-302
-	rd?d	undefined
-	rd?e	undefined
-	rd?f	undefined
-	rd?g	undefined
-	rd?h	undefined
+	hd?a	96	15936	1-166
+	hd?b	16032	13056	167-302
+	hd?c	0	29088	0-302
+	hd?d	undefined
+	hd?e	undefined
+	hd?f	undefined
+	hd?g	undefined
+	hd?h	undefined
 
 .Tn 9122S No partitions:
 .Sy	disk	start	length	cyls
-	rd?a	undefined
-	rd?b	undefined
-	rd?c	0	1232	0-76
-	rd?d	undefined
-	rd?e	undefined
-	rd?f	undefined
-	rd?g	undefined
-	rd?h	undefined
+	hd?a	undefined
+	hd?b	undefined
+	hd?c	0	1232	0-76
+	hd?d	undefined
+	hd?e	undefined
+	hd?f	undefined
+	hd?g	undefined
+	hd?h	undefined
 
 .Tn 7912P No partitions:
 .Sy	disk	start	length	cyls
-	rd?a	0	15904	0-70
-	rd?b	16128	22400	72-171
-	rd?c	0	128128	0-571
-	rd?d	16128	42560	72-261
-	rd?e	undefined
-	rd?f	undefined
-	rd?g	38528	89600	172-571
-	rd?h	58688	69440	262-571
+	hd?a	0	15904	0-70
+	hd?b	16128	22400	72-171
+	hd?c	0	128128	0-571
+	hd?d	16128	42560	72-261
+	hd?e	undefined
+	hd?f	undefined
+	hd?g	38528	89600	172-571
+	hd?h	58688	69440	262-571
 
 .Tn 7914CT/P No partitions:
 .Sy	disk	start	length	cyls
-	rd?a	224	15904	1-71
-	rd?b	16128	40320	72-251
-	rd?c	0	258048	0-1151
-	rd?d	16128	64960	72-361
-	rd?e	81088	98560	362-801
-	rd?f	179648	78400	802-1151
-	rd?g	56448	201600	252-1151
-	rd?h	81088	176960	362-1151
+	hd?a	224	15904	1-71
+	hd?b	16128	40320	72-251
+	hd?c	0	258048	0-1151
+	hd?d	16128	64960	72-361
+	hd?e	81088	98560	362-801
+	hd?f	179648	78400	802-1151
+	hd?g	56448	201600	252-1151
+	hd?h	81088	176960	362-1151
 
 .Tn 7958A No partitions:
 .Sy	disk	start	length	cyls
-	rd?a	252	16128	1-64
-	rd?b	16380	32256	65-192
-	rd?c	0	255276	0-1012
-	rd?d	16380	48384	65-256
-	rd?e	64764	100800	257-656
-	rd?f	165564	89712	657-1012
-	rd?g	48636	206640	193-1012
-	rd?h	64764	190512	257-1012
+	hd?a	252	16128	1-64
+	hd?b	16380	32256	65-192
+	hd?c	0	255276	0-1012
+	hd?d	16380	48384	65-256
+	hd?e	64764	100800	257-656
+	hd?f	165564	89712	657-1012
+	hd?g	48636	206640	193-1012
+	hd?h	64764	190512	257-1012
 
 .Tn 7957A No partitions:
 .Sy	disk	start	length	cyls
-	rd?a	154	16016	1-104
-	rd?b	16170	24640	105-264
-	rd?c	0	159544	0-1035
-	rd?d	16170	42350	105-379
-	rd?e	58520	54824	380-735
-	rd?f	113344	46200	736-1035
-	rd?g	40810	118734	265-1035
-	rd?h	58520	101024	380-1035
+	hd?a	154	16016	1-104
+	hd?b	16170	24640	105-264
+	hd?c	0	159544	0-1035
+	hd?d	16170	42350	105-379
+	hd?e	58520	54824	380-735
+	hd?f	113344	46200	736-1035
+	hd?g	40810	118734	265-1035
+	hd?h	58520	101024	380-1035
 
 .Tn 7933H No partitions:
 .Sy	disk	start	length	cyls
-	rd?a	598	16146	1-27
-	rd?b	16744	66976	28-139
-	rd?c	0	789958	0-1320
-	rd?d	83720	16146	140-166
-	rd?e	99866	165646	167-443
-	rd?f	265512	165646	444-720
-	rd?g	83720	706238	140-1320
-	rd?h	431158	358800	721-1320
+	hd?a	598	16146	1-27
+	hd?b	16744	66976	28-139
+	hd?c	0	789958	0-1320
+	hd?d	83720	16146	140-166
+	hd?e	99866	165646	167-443
+	hd?f	265512	165646	444-720
+	hd?g	83720	706238	140-1320
+	hd?h	431158	358800	721-1320
 
 .Tn 9134L No partitions:
 .Sy	disk	start	length	cyls
-	rd?a	80	15920	1-199
-	rd?b	16000	20000	200-449
-	rd?c	0	77840	0-972
-	rd?d	16000	32000	200-599
-	rd?e	undefined
-	rd?f	undefined
-	rd?g	36000	41840	450-972
-	rd?h	48000	29840	600-972
+	hd?a	80	15920	1-199
+	hd?b	16000	20000	200-449
+	hd?c	0	77840	0-972
+	hd?d	16000	32000	200-599
+	hd?e	undefined
+	hd?f	undefined
+	hd?g	36000	41840	450-972
+	hd?h	48000	29840	600-972
 
 .Tn 7936H No partitions:
 .Sy	disk	start	length	cyls
-	rd?a	861	16359	1-19
-	rd?b	17220	67158	20-97
-	rd?c	0	600978	0-697
-	rd?d	84378	16359	98-116
-	rd?e	100737	120540	117-256
-	rd?f	220416	120540	256-395
-	rd?g	84378	516600	98-697
-	rd?h	341817	259161	397-697
+	hd?a	861	16359	1-19
+	hd?b	17220	67158	20-97
+	hd?c	0	600978	0-697
+	hd?d	84378	16359	98-116
+	hd?e	100737	120540	117-256
+	hd?f	220416	120540	256-395
+	hd?g	84378	516600	98-697
+	hd?h	341817	259161	397-697
 
 .Tn 7937H No partitions:
 .Sy	disk	start	length	cyls
-	rd?a	1599	15990	1-10
-	rd?b	17589	67158	11-52
-	rd?c	0	1116102	0-697
-	rd?d	84747	15990	53-62
-	rd?e	100737	246246	63-216
-	rd?f	346983	246246	217-370
-	rd?g	84747	1031355	53-697
-	rd?h	593229	522873	371-697
+	hd?a	1599	15990	1-10
+	hd?b	17589	67158	11-52
+	hd?c	0	1116102	0-697
+	hd?d	84747	15990	53-62
+	hd?e	100737	246246	63-216
+	hd?f	346983	246246	217-370
+	hd?g	84747	1031355	53-697
+	hd?h	593229	522873	371-697
 
 .Tn 7957B/7961B No partitions:
 .Sy	disk	start	length	cyls
-	rd?a	126	16002	1-127
-	rd?b	16128	32760	128-387
-	rd?c	0	159894	0-1268
-	rd?d	16128	49140	128-517
-	rd?e	65268	50400	518-917
-	rd?f	115668	44226	918-1268
-	rd?g	48888	111006	388-1268
-	rd?h	65268	94626	518-1268
+	hd?a	126	16002	1-127
+	hd?b	16128	32760	128-387
+	hd?c	0	159894	0-1268
+	hd?d	16128	49140	128-517
+	hd?e	65268	50400	518-917
+	hd?f	115668	44226	918-1268
+	hd?g	48888	111006	388-1268
+	hd?h	65268	94626	518-1268
 
 .Tn 7958B/7962B No partitions:
 .Sy	disk	start	length	cyls
-	rd?a	378	16254	1-43
-	rd?b	16632	32886	44-130
-	rd?c	0	297108	0-785
-	rd?d	16632	49140	44-173
-	rd?e	65772	121716	174-495
-	rd?f	187488	109620	496-785
-	rd?g	49518	247590	131-785
-	rd?h	65772	231336	174-785
+	hd?a	378	16254	1-43
+	hd?b	16632	32886	44-130
+	hd?c	0	297108	0-785
+	hd?d	16632	49140	44-173
+	hd?e	65772	121716	174-495
+	hd?f	187488	109620	496-785
+	hd?g	49518	247590	131-785
+	hd?h	65772	231336	174-785
 
 .Tn 7959B/7963B No partitions:
 .Sy	disk	start	length	cyls
-	rd?a	378	16254	1-43
-	rd?b	16632	49140	44-173
-	rd?c	0	594216	0-1571
-	rd?d	16632	65772	44-217
-	rd?e	82404	303912	218-1021
-	rd?f	386316	207900	1022-1571
-	rd?g	65772	528444	174-1571
-	rd?h	82404	511812	218-1571
+	hd?a	378	16254	1-43
+	hd?b	16632	49140	44-173
+	hd?c	0	594216	0-1571
+	hd?d	16632	65772	44-217
+	hd?e	82404	303912	218-1021
+	hd?f	386316	207900	1022-1571
+	hd?g	65772	528444	174-1571
+	hd?h	82404	511812	218-1571
 .El
 .Pp
 The eight partitions as given support four basic, non-overlapping layouts,
@@ -259,50 +260,45 @@ In the first layout there are three partitions and a ``bootblock'' area.
 The bootblock area is at the beginning of the disk and holds
 the standalone disk boot program.
 The
-.Pa rd?a
+.Pa hd?a
 partition is for the root file system,
-.Pa rd?b
+.Pa hd?b
 is a paging/swapping area, and
-.Pa rd?g
+.Pa hd?g
 is for everything else.
 .Pp
 The second layout is the same idea,
 but has a larger paging/swapping partition
-.Pq Pa rd?d
+.Pq Pa hd?d
 and
 a smaller ``everything else'' partition
-.Pq Pa rd?h .
+.Pq Pa hd?h .
 This layout is better for environments which run many large processes.
 .Pp
 The third layout is a variation of the second,
 but breaks the
-.Pa rd?h
+.Pa hd?h
 partition into two partitions,
-.Pa rd?e
+.Pa hd?e
 and
-.Pa rd?f .
+.Pa hd?f .
 .Pp
 The final layout is intended for a large, single file system second disk.
 It is also used when writing out the boot program since it is the only
 partition mapping the bootblock area.
 .Sh FILES
-.Bl -tag -width /dev/rrd[0-7][a-h] -compact
-.It Pa /dev/rd[0-7][a-h]
+.Bl -tag -width /dev/rhd[0-7][a-h] -compact
+.It Pa /dev/hd[0-7][a-h]
 block files
-.It Pa /dev/rrd[0-7][a-h]
+.It Pa /dev/rhd[0-7][a-h]
 raw files
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
-.It "rd%d err: v%d u%d, R0x%x F0x%x A0x%x I0x%x, block %d"
+.It "hd%d err: v%d u%d, R0x%x F0x%x A0x%x I0x%x, block %d"
 An unrecoverable data error occurred during transfer of the
 specified block on the specified disk.
 .El
-.Sh HISTORY
-The
-.Nm
-driver
-.Ud
 .Sh BUGS
 The current disk partitioning is totally bogus.
 .Tn CS/80
diff --git a/share/man/man4/man4.hp300/hil.4 b/share/man/man4/man4.hp300/hil.4
index 579c7b4abd4..997f07a46f3 100644
--- a/share/man/man4/man4.hp300/hil.4
+++ b/share/man/man4/man4.hp300/hil.4
@@ -1,6 +1,7 @@
-.\"	$OpenBSD: hil.4,v 1.3 2000/03/02 14:46:46 todd Exp $
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$OpenBSD: hil.4,v 1.4 2001/05/11 01:24:20 millert Exp $
+.\"
+.\" Copyright (c) 1990, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Systems Programming Group of the University of Utah Computer
@@ -34,9 +35,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)hil.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)hil.4	8.2 (Berkeley) 11/30/93
 .\"
-.Dd March 27, 1991
+.Dd November 30, 1993
 .Dt HIL 4 hp300
 .Os
 .Sh NAME
@@ -224,7 +225,7 @@ ioctl.
 .It Dv HILIOCAROFF
 Disable Auto Repeat
 .Pp
-Turn off auto repeat on the keyboard while it is cooked mode.
+Turn off auto repeat on the keyboard while it is in cooked mode.
 Identical to the
 .Tn HP-UX
 .Dv HILDKR
@@ -373,8 +374,3 @@ specification.
 .It Bq Er EMFILE
 No more shared queues available.
 .El
-.Sh HISTORY
-The
-.Nm
-interface
-.Ud
diff --git a/share/man/man4/man4.hp300/intro.4 b/share/man/man4/man4.hp300/intro.4
index 27b81442463..66f69f32198 100644
--- a/share/man/man4/man4.hp300/intro.4
+++ b/share/man/man4/man4.hp300/intro.4
@@ -1,6 +1,7 @@
-.\"	$OpenBSD: intro.4,v 1.3 2000/03/02 14:46:46 todd Exp $
-.\" Copyright (c) 1990, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$OpenBSD: intro.4,v 1.4 2001/05/11 01:24:20 millert Exp $
+.\"
+.\" Copyright (c) 1990, 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
@@ -30,9 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)intro.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)intro.4	8.1 (Berkeley) 6/5/93
 .\"
-.Dd March 27, 1991
+.Dd June 5, 1993
 .Dt INTRO 4 hp300
 .Os
 .Sh NAME
@@ -95,9 +96,7 @@ The autoconfiguration system is described in
 A list of the supported devices is given below.
 .Sh SEE ALSO
 .Xr autoconf 4 ,
-.Xr intro 4 ,
-.Xr intro 4 ,
-.Xr config 8 .
+.Xr config 8
 .Rs
 .%T "Building 4.3 BSD UNIX Systems with Config (SMM:2)"
 .Re
diff --git a/share/man/man4/man4.hp300/ite.4 b/share/man/man4/man4.hp300/ite.4
index e941345c7b6..59ac668fd7c 100644
--- a/share/man/man4/man4.hp300/ite.4
+++ b/share/man/man4/man4.hp300/ite.4
@@ -1,6 +1,7 @@
-.\"	$OpenBSD: ite.4,v 1.3 2000/03/02 14:46:46 todd Exp $
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$OpenBSD: ite.4,v 1.4 2001/05/11 01:24:20 millert Exp $
+.\"
+.\" Copyright (c) 1990, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Systems Programming Group of the University of Utah Computer
@@ -34,9 +35,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)ite.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)ite.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 27, 1991
+.Dd June 9, 1993
 .Dt ITE 4 hp300
 .Os
 .Sh NAME
@@ -164,8 +165,3 @@ None under
 .Xr hil 4 ,
 .Xr rb 4 ,
 .Xr tc 4
-.Sh HISTORY
-The
-.Nm
-driver
-.Ud
diff --git a/share/man/man4/man4.hp300/le.4 b/share/man/man4/man4.hp300/le.4
index 5e01b7e228c..0467df6334d 100644
--- a/share/man/man4/man4.hp300/le.4
+++ b/share/man/man4/man4.hp300/le.4
@@ -1,6 +1,7 @@
-.\"	$OpenBSD: le.4,v 1.3 2000/03/02 14:46:46 todd Exp $
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$OpenBSD: le.4,v 1.4 2001/05/11 01:24:20 millert Exp $
+.\"
+.\" Copyright (c) 1990, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Systems Programming Group of the University of Utah Computer
@@ -34,9 +35,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)le.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)le.4	8.2 (Berkeley) 11/30/93
 .\"
-.Dd March 27, 1991
+.Dd November 30, 1993
 .Dt LE 4 hp300
 .Os
 .Sh NAME
@@ -47,7 +48,7 @@
 .Tn LANCE
 Ethernet interface
 .Sh SYNOPSIS
-.Cd "device le0 at scode?"
+.Cd "le* at dio? scode ?"
 .Sh DESCRIPTION
 The
 .Nm le
@@ -92,7 +93,7 @@ The interface was handed
 a message with addresses formatted in an unsuitable address
 family; the packet was dropped.
 .Pp
-The following message indicate a possible hardware error performing
+The following message indicates a possible hardware error performing
 the indicated operation during autoconfiguration or initialization.
 .Pp
 .It le%d: init timeout, stat = 0x%x.
@@ -103,8 +104,3 @@ The reset procedure continues anyway.
 .Xr arp 4 ,
 .Xr inet 4 ,
 .Xr intro 4
-.Sh HISTORY
-The
-.Nm le
-driver
-.Ud
diff --git a/share/man/man4/man4.hp300/mem.4 b/share/man/man4/man4.hp300/mem.4
index 7394d0b0e74..a717539274f 100644
--- a/share/man/man4/man4.hp300/mem.4
+++ b/share/man/man4/man4.hp300/mem.4
@@ -1,6 +1,7 @@
-.\"	$OpenBSD: mem.4,v 1.3 2000/04/27 00:35:56 deraadt Exp $
-.\" Copyright (c) 1990, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$OpenBSD: mem.4,v 1.4 2001/05/11 01:24:20 millert Exp $
+.\"
+.\" Copyright (c) 1990, 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
@@ -30,9 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)mem.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)mem.4	8.1 (Berkeley) 6/5/93
 .\"
-.Dd March 27, 1991
+.Dd June 5, 1993
 .Dt MEM 4 hp300
 .Os
 .Sh NAME
diff --git a/share/man/man4/man4.hp300/ppi.4 b/share/man/man4/man4.hp300/ppi.4
index 29e269a2ad8..8a9e769b770 100644
--- a/share/man/man4/man4.hp300/ppi.4
+++ b/share/man/man4/man4.hp300/ppi.4
@@ -1,6 +1,7 @@
-.\"	$OpenBSD: ppi.4,v 1.2 2000/03/02 14:46:46 todd Exp $
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$OpenBSD: ppi.4,v 1.3 2001/05/11 01:24:20 millert Exp $
+.\"
+.\" Copyright (c) 1990, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Systems Programming Group of the University of Utah Computer
@@ -34,9 +35,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)ppi.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)ppi.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 27, 1991
+.Dd June 9, 1993
 .Dt PPI 4 hp300
 .Os
 .Sh NAME
@@ -45,7 +46,7 @@
 .Tn HP-IB
 printer/plotter interface
 .Sh SYNOPSIS
-.Cd "device ppi0 at hpib0 slave 5"
+.Cd "ppi0 at hpibbus0 slave 5 punit 0"
 .Sh DESCRIPTION
 The
 .Nm ppi
@@ -70,12 +71,7 @@ The device files appear as follows:
 .Sh DIAGNOSTICS
 None.
 .Sh SEE ALSO
-.Xr hpib 4 .
-.Sh HISTORY
-The
-.Nm
-interface
-.Ud
+.Xr hpib 4
 .Sh BUGS
 This driver is very primitive, it handshakes data out byte by byte.
 It should use
diff --git a/share/man/man4/man4.hp300/rb.4 b/share/man/man4/man4.hp300/rb.4
index acbbd0775a3..47c23da3529 100644
--- a/share/man/man4/man4.hp300/rb.4
+++ b/share/man/man4/man4.hp300/rb.4
@@ -1,7 +1,7 @@
-.\"	$OpenBSD: rb.4,v 1.3 2000/12/15 14:31:20 aaron Exp $
+.\"	$OpenBSD: rb.4,v 1.4 2001/05/11 01:24:20 millert Exp $
 .\"
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" Copyright (c) 1990, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Systems Programming Group of the University of Utah Computer
@@ -35,9 +35,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)rb.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)rb.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 27, 1991
+.Dd June 9, 1993
 .Dt RB 4 hp300
 .Os
 .Sh NAME
@@ -165,14 +165,9 @@ Invalid ioctl specification.
 .El
 .Sh SEE ALSO
 .Xr ioctl 2 ,
-.Xr grf 4 .
+.Xr grf 4
 .Pp
 For extensive code examples using the
 Renaissance, see the X device dependent source.
-.Sh HISTORY
-The
-.Nm
-interface
-.Ud
 .Sh BUGS
 Not tested for all configurations of scan board and frame buffer memory boards.
diff --git a/share/man/man4/man4.hp300/rmp.4 b/share/man/man4/man4.hp300/rmp.4
deleted file mode 100644
index 7e26d1a411f..00000000000
--- a/share/man/man4/man4.hp300/rmp.4
+++ /dev/null
@@ -1,163 +0,0 @@
-.\"	$OpenBSD: rmp.4,v 1.3 2000/03/02 14:46:46 todd Exp $
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the Systems Programming Group of the University of Utah Computer
-.\" Science Department.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 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. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University 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 REGENTS 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.
-.\"
-.\"     from: @(#)rmp.4	5.2 (Berkeley) 3/27/91
-.\"
-.Dd March 27, 1991
-.Dt RMP 4 hp300
-.Os
-.Sh NAME
-.Nm rmp
-.Nd
-.Tn HP
-Remote Maintenance Protocol Family
-.Sh SYNOPSIS
-.Cd "options RMP"
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <netrmp/rmp.h>
-.Fd #include <netrmp/rmp_var.h>
-.Ft int
-.Fn socket AF_RMP SOCK_RAW proto
-.Sh DESCRIPTION
-Hewlett-Packard's Remote Maintenance Protocol family is a collection
-of protocols layered atop
-.Tn IEEE  802.3 .
-The current implementation of the RMP family provides protocol support only
-for the
-.Dv SOCK_RAW
-socket type.
-As a result,
-.Xr sendto 2
-and
-.Xr recvfrom 2
-must be used to send and
-receive
-.Tn RMP
-packets.
-.Pp
-The format of an
-.Tn RMP
-packet is defined in the include file
-.Aq Pa netrmp/rmp_var.h .
-The
-.Tn RMP
-packet arrives encapsulated in an
-.Pf ( Tn HP
-extended)
-.Tn IEEE  802.2
-packet.
-The
-.Tn IEEE  802.2
-packet
-is preceded by the kernel address of an
-.Ar ifnet struct
-which is used to `route' a packet out the same interface it
-arrived on.
-Outgoing packets are encapsulated in a standard
-.Tn IEEE  802.3
-packet, while incoming packets have this information stripped away.
-.Sh ADDRESSING
-.Tn RMP
-.Pf ( Tn IEEE
-802.3) addresses are 6 octets in length (48 bytes).
-Sockets in the Remote Maintenance Protocol family use the following
-addressing structure:
-.Bd -literal -offset indent
-struct sockaddr_rmp {
-	short		srmp_family;
-	u_char		srmp_dhost[6];
-};
-.Ed
-.Sh PROTOCOLS
-The
-.Tn RMP
-protocol family supported by the operating system
-is currently comprised of the Boot Protocol
-.Pq Em proto= Ns Dv RMPPROTO_BOOT .
-Unfortunately, we have no documentation on the Remote Maintenance
-Protocol and only sketchy information about the Boot Protocol.
-.Sh SEE ALSO
-.Xr bind 2 ,
-.Xr recvfrom 2 ,
-.Xr sendto 2 ,
-.Xr socket 2 ,
-.Xr intro 4 ,
-.Xr rbootd 8
-.Rs
-.%T "An Advanced 4.3 BSD Interprocess Communication Tutorial"
-.Re
-.Sh HISTORY
-The
-.Nm
-protocol interface
-.Ud
-.Sh BUGS
-.Bl -bullet
-.It
-The
-.Tn HP ROM
-uses
-.Tn IEEE
-802.3 (as opposed to Ethernet) packets.  While the
-kernel heuristically recognizes these packets, a more general mechanism
-for doing so should be provided.
-.It
-The
-.Tn HP ROM
-uses a multicast address when first trying to locate boot
-servers.  While the Ethernet [sic] board is programmed to recognize
-this particular multicast address (9:0:9:0:0:4), a more general
-mechanism for doing so should be provided.
-.It
-The kernel supports only
-.Tn RAW
-sockets for the
-.Tn RMP
-protocol.
-This is either a bug or a feature, since the kernel is smaller at the
-price of greater complexity in the server.
-.It
-There is no support for
-.Xr bind Ns 'ing
-an address in the
-.Tn RMP
-domain.
-Something like an
-.Dv RMPADDR_ANY
-should be provided to prevent more than one
-.Xr rbootd
-server from running at the same time.
-.El
diff --git a/share/man/man4/man4.hp300/st.4 b/share/man/man4/man4.hp300/st.4
index 51f2dc90dc3..a838d66bd9b 100644
--- a/share/man/man4/man4.hp300/st.4
+++ b/share/man/man4/man4.hp300/st.4
@@ -1,6 +1,7 @@
-.\"	$OpenBSD: st.4,v 1.5 2000/03/02 14:46:46 todd Exp $
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$OpenBSD: st.4,v 1.6 2001/05/11 01:24:20 millert Exp $
+.\"
+.\" Copyright (c) 1990, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Systems Programming Group of the University of Utah Computer
@@ -34,9 +35,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)st.4	5.3 (Berkeley) 7/31/91
+.\"     from: @(#)st.4	8.2 (Berkeley) 11/30/93
 .\"
-.Dd July 31, 1991
+.Dd November 30, 1993
 .Dt ST 4 hp300
 .Os
 .Sh NAME
@@ -45,7 +46,7 @@
 .Tn CCS SCSI
 tape driver
 .Sh SYNOPSIS
-.Cd "tape st0 at scsi? slave ?"
+.Cd "st* at oscsi? target ? lun ?"
 .Sh DESCRIPTION
 The
 .Nm
@@ -154,11 +155,6 @@ nrst56	X	X	X	X
 .Rs
 .%T EXB-8200 8MM Cartridge Tape Subsystem Interface User Manual.
 .Re
-.Sh HISTORY
-The
-.Nm
-driver
-.Ud
 .Sh BUGS
 The
 .Tn HP
@@ -194,10 +190,9 @@ will not work
 .Pf ( Dq Li tar c
 is ok).  One can only start writing at  1) beginning of tape, 2) on the
 end of what was last written, 3) "front" side of a regular (long) filemark.
-Say you have a tape with 3 tar files on it, want to save the first
-file, and want to begin writing over the 2nd file.
-.Pp
-On a normal 1/4" or 1/2" drive you would do:
+For example, you have a tape with 3 tar files. If you want to save the first 
+file, but overwrite the second two files with new data, on a normal
+1/4" or 1/2" drive you would do:
 .Pp
 .Li "mt fsf 1; tar cf /dev/nrst0 ..."
 .Pp
diff --git a/share/man/man4/man4.hp300/tc.4 b/share/man/man4/man4.hp300/tc.4
index bc30a60a2b9..808d71b916d 100644
--- a/share/man/man4/man4.hp300/tc.4
+++ b/share/man/man4/man4.hp300/tc.4
@@ -1,7 +1,7 @@
-.\"	$OpenBSD: tc.4,v 1.4 2000/12/15 14:31:20 aaron Exp $
+.\"	$OpenBSD: tc.4,v 1.5 2001/05/11 01:24:21 millert Exp $
 .\"
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" Copyright (c) 1990, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Systems Programming Group of the University of Utah Computer
@@ -35,13 +35,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)tc.4	5.2 (Berkeley) 3/27/91
+.\"     from: @(#)tc.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 27, 1991
+.Dd June 9, 1993
 .Dt TC 4 hp300
 .Os
 .Sh NAME
-.Nm \&tc
+.Nm tc
 .Nd
 .Tn HP98544
 98550 ``Topcat'' and ``Catseye'' device interface
@@ -176,8 +176,3 @@ specification.
 .Sh SEE ALSO
 .Xr ioctl 2 ,
 .Xr grf 4
-.Sh HISTORY
-The
-.Nm
-driver
-.Ud