if it is isa/pci/pcmcia, and found on more machines, move it up a bit

20 files changed, 42 insertions, 46 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 1b78f756c71..8518fa40e8c 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,24 +1,21 @@
-#	$OpenBSD: Makefile,v 1.117 2000/05/18 17:06:47 millert Exp $
+#	$OpenBSD: Makefile,v 1.118 2000/05/20 17:19:50 deraadt Exp $
 
-MAN=	ac97.4 an.4 atalk.4 atapiscsi.4 audio.4 adv.4 ahc.4 aue.4 bpf.4 \
-	bridge.4 cardbus.4 ccd.4 cd.4 ch.4 clnp.4 cltp.4 cmpci.4 cnw.4 \
-	cue.4 dc.4 ddb.4 de.4 \
-	dpt.4 drum.4 eap.4 ec.4 ef.4 enc.4 ep.4 esis.4 eso.4 ess.4 exphy.4 \
-	fd.4 ffs_softupdates.4 fpa.4 fxp.4 gdt.4 gre.4 hifn.4 icmp.4 icsphy.4 \
-	idp.4 ifmedia.4 inet.4 inphy.4 iophy.4 ip.4 ipl.4 ipsec.4 isa.4 \
-	isapnp.4 \
-	iso.4 isp.4 ksyms.4 kue.4 lkm.4 lmc.4 lo.4 lxtphy.4 midi.4 mii.4 \
-	mtdphy.4 mtio.4 ncr.4 ne.4 neo.4 netintro.4 ns.4 nsip.4 nsphy.4 \
-	nsphyter.4 \
+MAN=	ac97.4 adv.4 aha.4 ahb.4 ahc.4 aic.4  an.4 aria.4 ast.4 atalk.4 \
+	atapiscsi.4 audio.4 aue.4 awi.4 bpf.4 bridge.4 cardbus.4 ccd.4 \
+	cd.4 ch.4 clnp.4 cltp.4 cmpci.4 cnw.4 com.4 cue.4 cy.4 dc.4 ddb.4 \
+	de.4 dpt.4 drum.4 eap.4 ec.4 ef.4 eg.4 el.4 enc.4 ep.4 esis.4 \
+	eso.4 ess.4 exphy.4 fd.4 fdc.4 ffs_softupdates.4 fpa.4 fxp.4 \
+	gdt.4 gre.4 hifn.4 icmp.4 icsphy.4 idp.4 ifmedia.4 inet.4 \
+	inphy.4 iophy.4 ip.4 ipl.4 ipsec.4 isa.4 isapnp.4 iso.4 isp.4 \
+	ksyms.4 kue.4 lkm.4 lmc.4 lo.4 lxtphy.4 midi.4 mii.4 mtdphy.4 \
+	mtio.4 ncr.4 ne.4 neo.4 netintro.4 ns.4 nsip.4 nsphy.4 nsphyter.4 \
 	null.4 ohci.4 opl.4 options.4 pchb.4 pci.4 pciide.4 pcmcia.4 pty.4 \
-	puc.4 qsphy.4 raid.4 \
-	random.4 ray.4 rl.4 rln.4 rlphy.4 route.4 scsi.4 sd.4 ses.4 sf.4 \
-	sis.4 sk.4 sl.4 sm.4 spp.4 sppp.4 sqphy.4 ss.4 st.4 ste.4 sv.4 \
-	tb.4 tcic.4 tcp.4 termios.4 ti.4 tl.4 tlphy.4 tp.4 tqphy.4 tty.4 \
-	tun.4 tx.4 txphy.4 \
-	uaudio.4 udp.4 ugen.4 uhci.4 uhid.4 uk.4 ukphy.4 ulpt.4 \
-	umass.4 unix.4 urio.4 usb.4 vlan.4 vnd.4 vr.4 wb.4 wd.4 we.4 wx.4 xl.4 \
-	ym.4 zero.4
+	puc.4 qsphy.4 raid.4 random.4 ray.4 rl.4 rln.4 rlphy.4 route.4 scsi.4 \
+	sd.4 ses.4 sf.4 sis.4 sk.4 sl.4 sm.4 spp.4 sppp.4 sqphy.4 ss.4 st.4 \
+	ste.4 sv.4 tb.4 tcic.4 tcp.4 termios.4 ti.4 tl.4 tlphy.4 tp.4 tqphy.4 \
+	tty.4 tun.4 tx.4 txphy.4 uaudio.4 udp.4 ugen.4 uhci.4 uhid.4 uk.4 \
+	ukphy.4 ulpt.4 umass.4 unix.4 urio.4 usb.4 vlan.4 vnd.4 vr.4 wb.4 \
+	wd.4 wdc.4 we.4 wi.4 wx.4 xe.4 xl.4 ym.4 zero.4
 
 # IPv6
 MAN+=	faith.4 gif.4 icmp6.4 inet6.4 ip6.4
@@ -37,4 +34,7 @@ MLINKS+=pcmcia.4 pcic.4
 SUBDIR=	man4.alpha man4.amiga man4.hp300 \
 	man4.i386 man4.mac68k man4.mvme68k man4.pmax man4.powerpc man4.sparc
 
+# i386 specific
+MLINKS+= com.4 pccom.4
+
 .include <bsd.prog.mk>
diff --git a/share/man/man4/man4.i386/aha.4 b/share/man/man4/aha.4
index 0c3b8cb8606..971142422fc 100644
--- a/share/man/man4/man4.i386/aha.4
+++ b/share/man/man4/aha.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: aha.4,v 1.8 1999/06/05 13:18:35 aaron Exp $
+.\"	$OpenBSD: aha.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
diff --git a/share/man/man4/man4.i386/ahb.4 b/share/man/man4/ahb.4
index 82810e12320..398ec5cd9b0 100644
--- a/share/man/man4/man4.i386/ahb.4
+++ b/share/man/man4/ahb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ahb.4,v 1.7 1999/07/09 13:35:43 aaron Exp $
+.\"	$OpenBSD: ahb.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
diff --git a/share/man/man4/man4.i386/aic.4 b/share/man/man4/aic.4
index 89dcb9dd1e5..695e2259e6b 100644
--- a/share/man/man4/man4.i386/aic.4
+++ b/share/man/man4/aic.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: aic.4,v 1.6 1999/06/05 13:18:35 aaron Exp $
+.\"	$OpenBSD: aic.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"	$NetBSD: aic.4,v 1.5 1998/06/07 09:08:45 enami Exp $
 .\"
 .\" Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
diff --git a/share/man/man4/man4.i386/aria.4 b/share/man/man4/aria.4
index 769b842d68b..e4a18d3af86 100644
--- a/share/man/man4/man4.i386/aria.4
+++ b/share/man/man4/aria.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: aria.4,v 1.5 1999/07/09 13:35:43 aaron Exp $
+.\"	$OpenBSD: aria.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"	aria.4
 .\" Copyright (c) 1996 Roland C. Dowdeswell
 .\" All rights reserved.
diff --git a/share/man/man4/man4.i386/ast.4 b/share/man/man4/ast.4
index 81f06e309c2..d28e41699c1 100644
--- a/share/man/man4/man4.i386/ast.4
+++ b/share/man/man4/ast.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ast.4,v 1.5 1999/07/09 13:35:43 aaron Exp $
+.\"	$OpenBSD: ast.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"	$NetBSD: ast.4,v 1.7 1996/03/16 00:07:07 thorpej Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
diff --git a/share/man/man4/man4.i386/awi.4 b/share/man/man4/awi.4
index ce1bdc63473..5cd0ce37c85 100644
--- a/share/man/man4/man4.i386/awi.4
+++ b/share/man/man4/awi.4
@@ -1,8 +1,8 @@
 .\"     $NetBSD: awi.4,v 1.1 1999/11/04 19:36:01 sommerfeld Exp $
-.\"	$OpenBSD: awi.4,v 1.4 2000/04/03 21:19:37 aaron Exp $
+.\"	$OpenBSD: awi.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"
 .\"
-.\"	$Id: awi.4,v 1.4 2000/04/03 21:19:37 aaron Exp $
+.\"	$Id: awi.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"
 .Dd October 31, 1999
 .Dt AWI 4
diff --git a/share/man/man4/man4.i386/boca.4 b/share/man/man4/boca.4
index 94f65fd4d7e..a4642b11561 100644
--- a/share/man/man4/man4.i386/boca.4
+++ b/share/man/man4/boca.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boca.4,v 1.6 1999/07/09 13:35:43 aaron Exp $
+.\"	$OpenBSD: boca.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
diff --git a/share/man/man4/man4.i386/bt.4 b/share/man/man4/bt.4
index 1abc24c98d7..b61e3f26560 100644
--- a/share/man/man4/man4.i386/bt.4
+++ b/share/man/man4/bt.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bt.4,v 1.7 1999/06/05 13:18:35 aaron Exp $
+.\"	$OpenBSD: bt.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
diff --git a/share/man/man4/man4.i386/com.4 b/share/man/man4/com.4
index 41a965ef1b9..af46672ccf4 100644
--- a/share/man/man4/man4.i386/com.4
+++ b/share/man/man4/com.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: com.4,v 1.7 1999/11/28 12:29:00 downsj Exp $
+.\"	$OpenBSD: com.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"	$NetBSD: com.4,v 1.5 1996/03/16 00:07:08 thorpej Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
diff --git a/share/man/man4/man4.i386/cy.4 b/share/man/man4/cy.4
index 47ccc56653f..6145a08bf2c 100644
--- a/share/man/man4/man4.i386/cy.4
+++ b/share/man/man4/cy.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cy.4,v 1.5 1999/07/07 10:50:10 aaron Exp $
+.\"	$OpenBSD: cy.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"
 .\" Copyright (c) 1993 Andrew Herbert.
 .\" All rights reserved.
diff --git a/share/man/man4/man4.i386/eg.4 b/share/man/man4/eg.4
index b0b5ba3218f..cb19ac69b5c 100644
--- a/share/man/man4/man4.i386/eg.4
+++ b/share/man/man4/eg.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: eg.4,v 1.9 1999/08/04 17:18:47 deraadt Exp $
+.\"	$OpenBSD: eg.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"     $NetBSD: ec.4,v 1.4 1998/08/09 00:39:02 thorpej Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/share/man/man4/man4.i386/el.4 b/share/man/man4/el.4
index fb94257bf87..ef63aab56e0 100644
--- a/share/man/man4/man4.i386/el.4
+++ b/share/man/man4/el.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: el.4,v 1.6 1999/08/04 14:33:47 jason Exp $
+.\"	$OpenBSD: el.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"     $NetBSD: ec.4,v 1.4 1998/08/09 00:39:02 thorpej Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/share/man/man4/man4.i386/fdc.4 b/share/man/man4/fdc.4
index 687aa037cc7..8c0d576b855 100644
--- a/share/man/man4/man4.i386/fdc.4
+++ b/share/man/man4/fdc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fdc.4,v 1.11 2000/01/18 21:49:00 aaron Exp $
+.\"	$OpenBSD: fdc.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"	$NetBSD: fdc.4,v 1.6 1996/03/22 01:55:14 andrew Exp $
 .\"
 .\" Copyright (c) 1996 Andrew C. Wheadon
diff --git a/share/man/man4/man4.i386/hsq.4 b/share/man/man4/hsq.4
index c87c143f15f..312b9229a31 100644
--- a/share/man/man4/man4.i386/hsq.4
+++ b/share/man/man4/hsq.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hsq.4,v 1.1 1999/11/28 12:30:20 downsj Exp $
+.\"	$OpenBSD: hsq.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index 4004bd096fc..ca0221931ec 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,18 +1,14 @@
-#	$OpenBSD: Makefile,v 1.32 1999/12/16 02:56:56 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.33 2000/05/20 17:19:52 deraadt 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 apm.4 aria.4 ast.4 autoconf.4 bktr.4 boca.4
-MAN+=	bt.4 com.4 cy.4 fdc.4 hsq.4 iy.4 lms.4 lpt.4 mcd.4 mem.4 mms.4 mtrr.4
-MAN+=	npx.4 pctr.4 pms.4 rtfps.4 scd.4 sea.4 speaker.4 uha.4 wdc.4 wdt.4
-MAN+=	eg.4 el.4 ie.4 joy.4 le.4 wt.4
-MAN+=	gus.4 pss.4 sb.4 wi.4 awi.4 wss.4 xe.4
-MAN+=	xf86.4
+MAN=	apm.4 autoconf.4 bktr.4 gus.4 ie.4 intro.4 iy.4 joy.4 le.4 lms.4 \
+	lpt.4 mcd.4 mem.4 mms.4 mtrr.4 npx.4 pctr.4 pms.4 pss.4 sb.4 \
+	scd.4 sea.4 speaker.4 uha.4 wdt.4 wss.4 wt.4 xf86.4
 
 MLINKS+= speaker.4 spkr.4
 MLINKS+= mem.4 kmem.4
 MLINKS+= pms.4 psm.4
-MLINKS+= com.4 pccom.4
 MANSUBDIR=/i386
 
 .include <bsd.prog.mk>
diff --git a/share/man/man4/man4.i386/rtfps.4 b/share/man/man4/rtfps.4
index 868076fd462..6bfd61a81fc 100644
--- a/share/man/man4/man4.i386/rtfps.4
+++ b/share/man/man4/rtfps.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rtfps.4,v 1.5 1999/07/09 13:35:44 aaron Exp $
+.\"	$OpenBSD: rtfps.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
diff --git a/share/man/man4/man4.i386/wdc.4 b/share/man/man4/wdc.4
index 7ebf0ec7425..1c5ab946b53 100644
--- a/share/man/man4/man4.i386/wdc.4
+++ b/share/man/man4/wdc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wdc.4,v 1.9 1999/07/22 12:46:54 aaron Exp $
+.\"	$OpenBSD: wdc.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"	$NetBSD: wdc.4,v 1.4 1999/05/19 14:44:02 bouyer Exp $
 .\"
 .\" Copyright (c) 1998 Manuel Bouyer.
diff --git a/share/man/man4/man4.i386/wi.4 b/share/man/man4/wi.4
index 9dfb9371262..6e2c59a973b 100644
--- a/share/man/man4/man4.i386/wi.4
+++ b/share/man/man4/wi.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wi.4,v 1.6 2000/04/03 21:19:38 aaron Exp $
+.\"	$OpenBSD: wi.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
diff --git a/share/man/man4/man4.i386/xe.4 b/share/man/man4/xe.4
index 8d537601e41..444c9db1e0c 100644
--- a/share/man/man4/man4.i386/xe.4
+++ b/share/man/man4/xe.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: xe.4,v 1.2 1999/07/23 22:25:31 deraadt Exp $
+.\"	$OpenBSD: xe.4,v 1.1 2000/05/20 17:19:51 deraadt Exp $
 .\"
 .\" Copyright (c) 1999 Niklas Hallqvist
 .\" All rights reserved.