delete references to mcd

5 files changed, 8 insertions, 73 deletions

diff --git a/share/man/man4/isa.4 b/share/man/man4/isa.4
index 059f4f97434..03e2e951d5d 100644
--- a/share/man/man4/isa.4
+++ b/share/man/man4/isa.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isa.4,v 1.67 2010/03/28 17:04:28 deraadt Exp $
+.\"	$OpenBSD: isa.4,v 1.68 2011/06/26 23:23:55 tedu Exp $
 .\"	$NetBSD: isa.4,v 1.19 2000/03/18 16:54:37 augustss Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" (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 $Mdocdate: March 28 2010 $
+.Dd $Mdocdate: June 26 2011 $
 .Dt ISA 4
 .Os
 .Sh NAME
@@ -104,8 +104,6 @@ WD7000 compatible ISA SCSI interface
 .Bl -tag -width 12n -offset ind -compact
 .It Xr fdc 4
 NEC765 compatible floppy disk driver
-.It Xr mcd 4
-Mitsumi CD-ROM drives
 .It Xr wdc 4
 Standard Western Digital type hard drive controllers: MFM, RLL, ESDI,
 and IDE/ATAPI.
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index ab10cd732a8..cd20452358b 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile,v 1.69 2010/02/19 15:28:30 phessler Exp $
+#	$OpenBSD: Makefile,v 1.70 2011/06/26 23:23:55 tedu Exp $
 #	from: @(#)Makefile	5.1 (Berkeley) 2/12/91
 #	Id: Makefile,v 1.4 1995/12/14 05:41:38 deraadt Exp $
 
 MAN=	amdpcib.4 amdmsr.4 apm.4 autoconf.4 bios.4 cpu.4 elansc.4 \
 	esm.4 geodesc.4 glxpcib.4 glxsb.4 gscpcib.4 gscpm.4 gus.4 ie.4 \
 	ichpcib.4 intro.4 ioapic.4 \
-	joy.4 le.4 lms.4 mcd.4 mem.4 mms.4 mpbios.4 mtrr.4 npx.4 nvram.4 \
+	joy.4 le.4 lms.4 mem.4 mms.4 mpbios.4 mtrr.4 npx.4 nvram.4 \
 	pas.4 pcibios.4 pctr.4 piixpcib.4 pss.4 sb.4 \
 	sea.4 uha.4 wds.4 wdt.4 wss.4
 
diff --git a/share/man/man4/man4.i386/mcd.4 b/share/man/man4/man4.i386/mcd.4
deleted file mode 100644
index c571ecd9185..00000000000
--- a/share/man/man4/man4.i386/mcd.4
+++ /dev/null
@@ -1,46 +0,0 @@
-.\"	$OpenBSD: mcd.4,v 1.10 2007/05/31 19:19:55 jmc Exp $
-.\"
-.\" 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 $Mdocdate: May 31 2007 $
-.Dt MCD 4 i386
-.Os
-.Sh NAME
-.Nm mcd
-.Nd Mitsumi CD-ROM driver
-.Sh SYNOPSIS
-.Cd "mcd0 at isa? port 0x300 irq 10"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for Mitsumi CD-ROM drives and controllers.
-.Sh FILES
-.Bl -tag -width /dev/rmcdx -compact
-.It Pa /dev/mcd*
-.It Pa /dev/rmcd*
-.El
-.Sh SEE ALSO
-.Xr cd 4 ,
-.Xr intro 4 ,
-.Xr isa 4
diff --git a/share/man/man8/boot_config.8 b/share/man/man8/boot_config.8
index 22cbba44cf0..b31e7c66cbc 100644
--- a/share/man/man8/boot_config.8
+++ b/share/man/man8/boot_config.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot_config.8,v 1.25 2007/05/31 19:19:58 jmc Exp $
+.\"	$OpenBSD: boot_config.8,v 1.26 2011/06/26 23:23:55 tedu Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 26 2011 $
 .Dt BOOT_CONFIG 8
 .Os
 .Sh NAME
@@ -142,20 +142,6 @@ The device can be specified by either name or number.
 UKC>
 .Ed
 .Pp
-Another case is a mistakenly detected non-existing device instead of another
-device at the probed location.
-One known case is the Mitsumi
-CD-ROM in OpenBSD/i386.
-The simplest thing to solve that problem is to disable mcd0.
-.Bd -literal
-.No UKC> Ic find mcd0
- 29 mcd0 at isa0 port 0x300 size 0 iomem -1 iosiz 0 irq 10 drq -1 drq2 -1 flags 0x0
-.No UKC> Ic disable mcd0
- 29 mcd0 disabled
-.No UKC> Ic find 29
- 29 mcd0 at isa0 disable port 0x300 size 0 iomem -1 iosiz 0 irq 10 drq -1 drq2 -1 flags 0x0
-.Ed
-.Pp
 The show command is useful for finding which devices have a certain attribute.
 It can also be used to find those devices with a particular value for
 an attribute.
diff --git a/share/man/man8/man8.i386/MAKEDEV.8 b/share/man/man8/man8.i386/MAKEDEV.8
index 16da2c93d8c..fc56cc2b64c 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.77 2010/10/11 14:34:36 claudio Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.78 2011/06/26 23:23:55 tedu Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 11 2010 $
+.Dd $Mdocdate: June 26 2011 $
 .Dt MAKEDEV 8 i386
 .Os
 .Sh NAME
@@ -83,9 +83,6 @@ ATAPI and SCSI CD-ROM drives, see
 .It Ar fd*
 Floppy disk drives (3 1/2", 5 1/4"), see
 .Xr fd 4 .
-.It Ar mcd*
-Mitsumi CD-ROM drives, see
-.Xr mcd 4 .
 .It Ar raid*
 RAIDframe disk devices, see
 .Xr raid 4 .