isapnp devices sync;

4 files changed, 20 insertions, 23 deletions

diff --git a/share/man/man4/isapnp.4 b/share/man/man4/isapnp.4
index b16a94208e9..83fed1ef4e4 100644
--- a/share/man/man4/isapnp.4
+++ b/share/man/man4/isapnp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isapnp.4,v 1.35 2006/09/21 13:10:26 jmc Exp $
+.\"	$OpenBSD: isapnp.4,v 1.36 2006/09/21 13:20:27 jmc Exp $
 .\"	$NetBSD: isapnp.4,v 1.8 1998/06/07 09:08:46 enami Exp $
 .\"
 .\" Copyright (c) 1997 Jonathan Stone
@@ -53,18 +53,16 @@ and driver name:
 .Ss Disk controllers
 .Bl -tag -width 12n -offset ind -compact
 .It Xr aha 4
-Adaptec AHA-154x SCSI controller card
+Adaptec 154x SCSI interface
 .It Xr aic 4
-Adaptec AHA-1520B SCSI controller card
+Adaptec AIC-6260 and AIC-6360 SCSI interface
 .It Xr wdc 4
-IDE controllers (typically found on sound cards)
+WD100x compatible hard disk controller driver
 .El
 .Ss Serial and parallel interfaces
 .Bl -tag -width 12n -offset ind -compact
 .It Xr com 4 , Xr pccom 4
-8250/16450/16550/16650/16850-compatible ISA PnP serial cards and internal
-modems.
-Winmodems are not supported.
+serial communications interface
 .El
 .Ss Network interfaces
 .Bl -tag -width 12n -offset ind -compact
@@ -84,27 +82,26 @@ Western Digital/SMC WD80x3, SMC Elite Ultra, and SMC EtherEZ Ethernet device
 .Ss Sound
 .Bl -tag -width 12n -offset ind -compact
 .It Xr ess 4
-ESS Technology AudioDrive 1788-, 1888-, 1887-, and 888-based sound cards
+ESS Technology AudioDrive family audio device
 .It Xr gus 4
-Gravis Ultrasound PnP sound cards
+Gravis UltraSound/UltraSound MAX audio device
 .It Xr mpu 4
-MIDI interfaces
+Roland/Yamaha MPU401 MIDI UART device
 .It Xr sb 4
-SoundBlaster series sound cards (SB16 PnP through AWE64)
+SoundBlaster family audio device
 .It Xr wss 4
-Windows Sound System cards
+Windows Sound System audio device
 .It Xr ym 4
-Yamaha OPL3-SA3 sound cards
+Yamaha OPL3-SAx audio device
 .El
 .Ss Miscellaneous devices
 .Bl -tag -width 12n -offset ind -compact
 .It Xr joy 4
-Joystick driver
+games adapter
 .It Xr pcic 4
-.Tn ISA
-PCMCIA controllers
+introduction to PCMCIA (PC Card) support
 .It Xr rt 4
-AIMS Lab Radiotrack FM radio tuners
+AIMS Lab Radiotrack FM radio device
 .El
 .Sh SEE ALSO
 .Xr intro 4 ,
diff --git a/share/man/man4/man4.i386/joy.4 b/share/man/man4/man4.i386/joy.4
index 00496fd8e04..2ff319a217e 100644
--- a/share/man/man4/man4.i386/joy.4
+++ b/share/man/man4/man4.i386/joy.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: joy.4,v 1.11 2003/03/07 09:39:07 jmc Exp $
+.\"	$OpenBSD: joy.4,v 1.12 2006/09/21 13:20:27 jmc Exp $
 .\"
 .\" Copyright (c) 1996 Matthieu Herrb
 .\" All rights reserved.
@@ -35,7 +35,7 @@
 .Os
 .Sh NAME
 .Nm joy
-.Nd Games adapter driver
+.Nd games adapter
 .Sh SYNOPSIS
 .Cd "joy0 at isa? port 0x201"
 .Cd "joy* at isapnp?"
diff --git a/share/man/man4/man4.i386/sb.4 b/share/man/man4/man4.i386/sb.4
index 39f1a74da4f..3d74dbfb07a 100644
--- a/share/man/man4/man4.i386/sb.4
+++ b/share/man/man4/man4.i386/sb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sb.4,v 1.11 2006/08/31 12:33:42 jmc Exp $
+.\"	$OpenBSD: sb.4,v 1.12 2006/09/21 13:20:27 jmc Exp $
 .\"	$NetBSD: sb.4,v 1.13 1997/10/31 15:02:33 augustss Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 .Os
 .Sh NAME
 .Nm sb
-.Nd SoundBlaster family (and compatibles) audio device
+.Nd SoundBlaster family audio device
 .Sh SYNOPSIS
 .Cd "sb0 at isa? port 0x220 irq 5 drq 1"
 .Cd "sb1 at isa? port 0x240 irq 7 drq 1 flags 1"
diff --git a/share/man/man4/mpu.4 b/share/man/man4/mpu.4
index 2e9254732a5..2a8fce31489 100644
--- a/share/man/man4/mpu.4
+++ b/share/man/man4/mpu.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mpu.4,v 1.3 2003/09/04 22:14:42 jmc Exp $
+.\" $OpenBSD: mpu.4,v 1.4 2006/09/21 13:20:27 jmc Exp $
 .\" $NetBSD: mpu.4,v 1.5 2001/03/30 14:34:27 minoura Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 .Os
 .Sh NAME
 .Nm mpu
-.Nd Roland/Yamaha MPU401 (and compatible) MIDI UART driver
+.Nd Roland/Yamaha MPU401 MIDI UART device
 .Sh SYNOPSIS
 .Cd "mpu*  at isa? port 0x300"
 .Cd "mpu*  at isapnp?"