Move ncr.4 out of man4.i386/ncr.4 and update it from NetBSD.

Remove one of the tekram cards from man4.i386/aha.4 that is really
ncr-based and add cd.4, fpa.4, sd.4, st.4, uk.4 from NetBSD
(some originally from FreeBSD).

3 files changed, 3 insertions, 46 deletions

diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index 9052374e98c..06f6137f371 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.12 1996/10/15 07:52:11 downsj Exp $
+#	$OpenBSD: Makefile,v 1.13 1997/03/28 22:53:44 millert Exp $
 #	from: @(#)Makefile	5.1 (Berkeley) 2/12/91
 #	Id: Makefile,v 1.4 1995/12/14 05:41:38 deraadt Exp $
 
 MAN=	intro.4 aha.4 ahb.4 aic.4 aria.4 ast.4 autoconf.4 boca.4 bt.4
-MAN+=	com.4 cy.4 ed.4 ep.4 fdc.4 iy.4 lms.4 lpt.4 mcd.4 mem.4 mms.4 ncr.4
+MAN+=	com.4 cy.4 ed.4 ep.4 fdc.4 iy.4 lms.4 lpt.4 mcd.4 mem.4 mms.4
 MAN+=	npx.4 pctr.4 pms.4 rtfps.4 scd.4 sea.4 speaker.4 uha.4 wd.4
 MAN+=	eg.4 el.4 ie.4 joy.4 le.4 wt.4
 MAN+=	gus.4 pss.4 sb.4 wss.4
diff --git a/share/man/man4/man4.i386/aha.4 b/share/man/man4/man4.i386/aha.4
index 4ab7c89a7a2..2efa7254077 100644
--- a/share/man/man4/man4.i386/aha.4
+++ b/share/man/man4/man4.i386/aha.4
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: aha.4,v 1.6 1997/03/28 22:53:45 millert Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
@@ -46,7 +47,6 @@ driver provides support for the following SCSI adapters:
 .It Buslogic BT-54x
 .It Tekram DC-300B
 .It Tekram DC-320E
-.It Tekram DC-380
 .El
 This driver uses bounce buffers if the machine has more than 16
 megabytes of memory.
diff --git a/share/man/man4/man4.i386/ncr.4 b/share/man/man4/man4.i386/ncr.4
deleted file mode 100644
index 50393e55783..00000000000
--- a/share/man/man4/man4.i386/ncr.4
+++ /dev/null
@@ -1,43 +0,0 @@
-.\"
-.\" Copyright (c) 1994 James A. Jegers
-.\" All rights reserved.
-.\"
-.\" 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. The name of the author may not 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 POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"
-.Dd November 29, 1994
-.Dt NCR 4 i386
-.Os
-.Sh NAME
-.Nm ncr
-.Nd NCR 53C810 SCSI driver
-.Sh SYNOPSIS
-.Cd "ncr* at pci? bus ? dev ?"
-.Cd "scsibus* at ncr?"
-.Sh DESCRIPTION
-The
-.Nm ncr
-driver provides support for the NCR 53C810 SCSI controller chip.
-.Sh SEE ALSO
-.Xr intro 4 ,
-.Xr sd 4 ,
-.Xr st 4 ,
-.Xr cd 4 ,
-.Xr ch 4