3 files changed, 27 insertions, 66 deletions
diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4
index 4e7fcc34f61..3d0651ea6fa 100644
--- a/share/man/man4/fdc.4
+++ b/share/man/man4/fdc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fdc.4,v 1.10 2004/09/30 19:59:24 mickey Exp $
+.\"	$OpenBSD: fdc.4,v 1.11 2005/03/09 18:58:50 miod Exp $
 .\"	$NetBSD: fdc.4,v 1.6 1996/03/22 01:55:14 andrew Exp $
 .\"
 .\" Copyright (c) 1996 Andrew C. Wheadon
@@ -31,21 +31,28 @@
 .\"
 .\"     @(#)fdc.4	8.1 (Berkeley) 3/22/96
 .\"
-.Dd March 25, 1996
+.Dd March 9, 2005
 .Dt FDC 4
 .Os
 .Sh NAME
 .Nm fdc
 .Nd NEC765 compatible floppy disk driver
 .Sh SYNOPSIS
-.Cd "fdc0 at isa? port 0x3f0 irq 6 drq 2"
+.Cd "fdc0 at isa? port 0x3f0 irq 6 drq 2    " Pq alpha and i386
+.Cd "fdc0 at mainbus0                       " Pq sun4c sparc
+.Cd "fdc0 at obio0                          " Pq sun4m sparc
+.Cd "fdc* at sbus?                          " Pq sparc64
+.\" .Cd "fdc* at ebus?                          " Pq sparc64
 .Cd "fd* at fdc? flags 0x00"
 .Sh DESCRIPTION
 The
 .Nm
 driver supports the standard AT floppy disk controllers.
 These include standard IDE, MFM, RLL,
-EIDE, ESDI, and SCSI controllers with floppy attachment.
+EIDE, ESDI and SCSI controllers with floppy attachment,
+commonly encountered on many isa bus machines,
+as well as the on-board floppy controller found on most
+sparc and UltraSPARC workstations.
 .Pp
 The standard names of a floppy drive will take the form
 .Pa /dev/fd{0,1,2,3}{,B,C,D,E,F,G,H}[a-p] .
@@ -73,7 +80,7 @@ The additional geometry types are as follows:
 The default geometry is the format specified in the BIOS, and
 is typically the largest supported format.
 .Pp
-Some floppy controllers do not respond correctly to probes, and
+Some isa floppy controllers do not respond correctly to probes, and
 the configuration file
 .Cm flags
 field can be used to specify a particular drive type, overriding the
@@ -93,13 +100,24 @@ field encode the drive type, as follows:
 .Pp
 If the 0x20 bit is on, the drive will be attached even
 if it was not found by the probe routine.
+These flags are ignored on
+.Nm
+controllers not connected to an
+.Xr isa 4
+bus.
 .Sh SEE ALSO
+.Xr eject 1 ,
+.Xr fdformat 1 ,
+.Xr ebus 4 ,
 .Xr intro 4 ,
-.Xr isa 4
+.Xr isa 4 ,
+.Xr sbus 4
 .Sh BUGS
 The
 .Nm
-driver can interfere with other controllers, namely some WD/SMC
+driver can interfere with other
+.Xr isa 4 
+controllers, namely some WD/SMC
 network controllers fail to work when the probing mechanism
 in the
 .Nm
diff --git a/share/man/man4/man4.sparc/Makefile b/share/man/man4/man4.sparc/Makefile
index 6a67a842eb2..226c9c8099e 100644
--- a/share/man/man4/man4.sparc/Makefile
+++ b/share/man/man4/man4.sparc/Makefile
@@ -1,14 +1,13 @@
-#	$OpenBSD: Makefile,v 1.41 2004/09/28 19:35:48 jason Exp $
+#	$OpenBSD: Makefile,v 1.42 2005/03/09 18:58:52 miod Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 2/16/94
 
 MAN=	agten.4 audioamd.4 audiocs.4 autoconf.4 auxreg.4 be.4 bpp.4 bwtwo.4 \
 	cgtwo.4 cgthree.4 cgfour.4 cgsix.4 cgeight.4 cgtwelve.4 cgfourteen.4 \
-	clock.4 daadio.4 esp.4 fd.4 fga.4 ie.4 intro.4 le.4 led.4 magma.4 \
+	clock.4 daadio.4 esp.4 fga.4 ie.4 intro.4 le.4 led.4 magma.4 \
 	mem.4 mgx.4 openprom.4 pninek.4 pnozz.4 presto.4 qe.4 qec.4 rfx.4 \
 	scf.4 si.4 spif.4 sw.4 tctrl.4 tcx.4 timer.4 tslot.4 tvtwo.4 vigra.4 \
 	xbox.4 xd.4 xy.4 zs.4 zx.4
 MLINKS=	clock.4 oclock.4 \
-	fd.4 fdc.4 \
 	fga.4 fvme.4 \
 	le.4 lebuffer.4 le.4 ledma.4 \
 	mem.4 kmem.4 \
diff --git a/share/man/man4/man4.sparc/fd.4 b/share/man/man4/man4.sparc/fd.4
deleted file mode 100644
index 9b7ab2600ad..00000000000
--- a/share/man/man4/man4.sparc/fd.4
+++ /dev/null
@@ -1,56 +0,0 @@
-.\"	$OpenBSD: fd.4,v 1.6 2003/05/01 18:44:39 jmc Exp $
-.\"	$NetBSD: fd.4,v 1.4 1997/11/12 00:49:42 mrg Exp $
-.\"
-.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Paul Kranenburg.
-.\"
-.\" 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 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 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 FOUNDATION 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 June 23, 1996
-.Dt FD 4 sparc
-.Os
-.Sh NAME
-.Nm fd ,
-.Nm fdc
-.Nd SPARCstation floppy drive
-.Sh SYNOPSIS
-.Cd "fdc0 at mainbus0" Pq sun4c
-.Cd "fdc0 at obio0" Pq sun4m
-.Cd "fd* at fdc0"
-.Sh DESCRIPTION
-This is the driver for the built-in diskette drive found on the
-SPARCstation 1, and (optionally) other desktop SPARC systems.
-.Sh SEE ALSO
-.Xr eject 1 ,
-.Xr fdformat 1 ,
-.Xr intro 4 ,
-.Xr sbus 4