acd goes away

4 files changed, 3 insertions, 51 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index b7557b32337..0ce5183ce90 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.67 1999/07/26 05:52:05 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.68 1999/07/30 19:06:36 deraadt Exp $
 #	$NetBSD: Makefile,v 1.22.4.2 1996/07/18 00:51:10 jtc Exp $
 
-MAN=	atalk.4 atapiscsi.4 audio.4 acd.4 adv.4 ahc.4 bpf.4 bridge.4 ccd.4 \
+MAN=	atalk.4 atapiscsi.4 audio.4 adv.4 ahc.4 bpf.4 bridge.4 ccd.4 \
 	cd.4 ch.4 clnp.4 cltp.4 ddb.4 de.4 drum.4 eap.4 ec.4 ep.4 esis.4 \
 	exphy.4 fd.4 ffs_softupdates.4 fpa.4 fxp.4 icmp.4 icsphy.4 idp.4 \
 	ifmedia.4 imp.4 inet.4 inphy.4 ip.4 ipl.4 ipsec.4 isapnp.4 iso.4 \
diff --git a/share/man/man4/acd.4 b/share/man/man4/acd.4
deleted file mode 100644
index a40bbad3869..00000000000
--- a/share/man/man4/acd.4
+++ /dev/null
@@ -1,45 +0,0 @@
-.\"	$OpenBSD: acd.4,v 1.5 1999/07/09 13:35:48 aaron Exp $
-.\"
-.\" Copyright (c) 1996, Jason Downs.  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. 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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(S) 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 May 14, 1996
-.Dt ACD 4
-.Os
-.Sh NAME
-.Nm acd
-.Nd ATAPI CD-ROM driver
-.Sh SYNOPSIS
-.Cd "atapibus* at wdc?"
-.Cd "acd* at atapibus? drive?"
-.Sh DESCRIPTION
-The
-.Nm acd
-driver provides support for ATAPI CD-ROM drives, using standard IDE
-controllers.
-.Sh FILES
-.Xr /dev/acd*
-.Xr /dev/racd*
-.Sh SEE ALSO
-.Xr intro 4 ,
-.Xr wdc 4
diff --git a/share/man/man8/compat_linux.8 b/share/man/man8/compat_linux.8
index 20ed206ff0e..4f57bf24bb4 100644
--- a/share/man/man8/compat_linux.8
+++ b/share/man/man8/compat_linux.8
@@ -354,7 +354,6 @@ Only the DSP device is emulated, the following link should be created:
 CD-ROM support requires a link to your cdrom device, similar to:
 .Pp
 .nf
-/emul/linux/dev/cdrom -> /dev/acd0a  (first atapi cdrom)
 /emul/linux/dev/cdrom -> /dev/cd0a   (first scsi cdrom)
 .fi
 .Pp
diff --git a/share/man/man8/man8.i386/MAKEDEV.8 b/share/man/man8/man8.i386/MAKEDEV.8
index 69e61df9b07..d04207ce4b4 100644
--- a/share/man/man8/man8.i386/MAKEDEV.8
+++ b/share/man/man8/man8.i386/MAKEDEV.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: MAKEDEV.8,v 1.10 1999/07/09 13:35:36 aaron Exp $
+.\"	$OpenBSD: MAKEDEV.8,v 1.11 1999/07/30 19:06:41 deraadt Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -111,8 +111,6 @@ pccons console or pcvt screen 0
 pcvt console screens
 .It Ar tty#
 standard PC COM ports
-.It Ar acd#
-ATAPI CD-ROM drives
 .It Ar cd#
 SCSI CD-ROM drives
 .It Ar mcd#