prefer `buses' to `busses' for the noun plural;

25 files changed, 69 insertions, 69 deletions

diff --git a/lib/libarch/amd64/amd64_get_mtrr.2 b/lib/libarch/amd64/amd64_get_mtrr.2
index 58a75dd9d7b..f23490119be 100644
--- a/lib/libarch/amd64/amd64_get_mtrr.2
+++ b/lib/libarch/amd64/amd64_get_mtrr.2
@@ -57,7 +57,7 @@ on
 .Xr pci 4
 and
 .Xr agp 4
-busses.
+buses.
 For example, enabling write-combining allows bus-write transfers
 to be combined into a larger transfer before bursting over the bus.
 This can increase performance of write operations 2.5 times or more.
diff --git a/sbin/iopctl/iopctl.8 b/sbin/iopctl/iopctl.8
index a3a0b693dd3..8c31200900b 100644
--- a/sbin/iopctl/iopctl.8
+++ b/sbin/iopctl/iopctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: iopctl.8,v 1.7 2005/09/30 20:34:23 jaredy Exp $
+.\"	$OpenBSD: iopctl.8,v 1.8 2006/10/28 10:26:26 jmc Exp $
 .\"	$NetBSD: iopctl.8,v 1.4 2001/03/20 13:07:51 ad Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@ The default is
 The following commands are available:
 .Bl -tag -width indent
 .It reconfig
-Reconfigure the IOP: ask all bus ports to rescan their busses, and attach or
+Reconfigure the IOP: ask all bus ports to rescan their buses, and attach or
 detach devices to and from the system as necessary.
 .It showddmid Ar tid
 Retrieve and display the DDM (device driver module) identity parameter group
diff --git a/share/man/man4/ac97.4 b/share/man/man4/ac97.4
index 1592f3d9857..d9551541bde 100644
--- a/share/man/man4/ac97.4
+++ b/share/man/man4/ac97.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ac97.4,v 1.14 2005/08/09 08:14:55 jmc Exp $
+.\"	$OpenBSD: ac97.4,v 1.15 2006/10/28 10:26:26 jmc Exp $
 .\"
 .\" Copyright (c) 1999, 2000 Constantine Sapuntzakis
 .\"
@@ -37,7 +37,7 @@
 .Sh DESCRIPTION
 AC'97 codecs contain the analog-to-digital (A/D), digital-to-analog
 (D/A), and mixing circuitry of many modern sound cards.
-AC'97 codecs, for the most part, do not talk to host busses like the PCI bus
+AC'97 codecs, for the most part, do not talk to host buses like the PCI bus
 directly.
 Instead, they communicate through an interface chip, called
 the host controller.
diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4
index febc86d086f..283addf1be2 100644
--- a/share/man/man4/ahc.4
+++ b/share/man/man4/ahc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ahc.4,v 1.34 2006/09/21 12:50:44 jmc Exp $
+.\"	$OpenBSD: ahc.4,v 1.35 2006/10/28 10:26:26 jmc Exp $
 .\"	$NetBSD: ahc.4,v 1.1.2.1 1996/08/25 17:22:14 thorpej Exp $
 .\"
 .\" Copyright (c) 1995, 1996
@@ -194,7 +194,7 @@ aic7899     20    PCI/64     80MHz     16Bit    16      2 3 4 5 6 7 8
 .Pp
 .Bl -enum -compact
 .It
-Multiplexed Twin Channel Device - One controller servicing two busses.
+Multiplexed Twin Channel Device - One controller servicing two buses.
 .It
 Multi-function Twin Channel Device - Two controllers on one chip.
 .It
diff --git a/share/man/man4/ehci.4 b/share/man/man4/ehci.4
index b2faa3795a2..93411ee55d9 100644
--- a/share/man/man4/ehci.4
+++ b/share/man/man4/ehci.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ehci.4,v 1.7 2006/09/05 08:48:42 jmc Exp $
+.\" $OpenBSD: ehci.4,v 1.8 2006/10/28 10:26:26 jmc Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -62,7 +62,7 @@ Consequently each USB connector is electrically
 connected to two USB controllers.
 The handling of this is totally automatic,
 but can be noticed since USB 1.x and USB 2.0 devices plugged in to the same
-connector appear to connect to different USB busses.
+connector appear to connect to different USB buses.
 .Sh SEE ALSO
 .Xr cardbus 4 ,
 .Xr ohci 4 ,
diff --git a/share/man/man4/iop.4 b/share/man/man4/iop.4
index e6171fefcf9..239bdaf3206 100644
--- a/share/man/man4/iop.4
+++ b/share/man/man4/iop.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: iop.4,v 1.12 2005/09/30 20:34:24 jaredy Exp $
+.\"	$OpenBSD: iop.4,v 1.13 2006/10/28 10:26:26 jmc Exp $
 .\"	$NetBSD: iop.4,v 1.7 2001/03/20 13:09:19 ad Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@ Request that the
 driver scan all bus ports, retrieve the latest version of the LCT, and
 attach or detach devices as necessary.
 Note that higher-level reconfiguration tasks (such as logically re-scanning
-SCSI busses) will not be performed by this ioctl.
+SCSI buses) will not be performed by this ioctl.
 .It Dv IOPIOCGTIDMAP (struct iovec)
 Retrieve the TID to device map.
 This map indicates which targets are configured, and what the corresponding
diff --git a/share/man/man4/man4.alpha/intro.4 b/share/man/man4/man4.alpha/intro.4
index b8c63988bb2..69e1880720a 100644
--- a/share/man/man4/man4.alpha/intro.4
+++ b/share/man/man4/man4.alpha/intro.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: intro.4,v 1.36 2006/09/08 09:25:53 jmc Exp $
+.\"     $OpenBSD: intro.4,v 1.37 2006/10/28 10:26:26 jmc Exp $
 .\"     $NetBSD: intro.4,v 1.10 2003/05/06 07:44:54 wiz Exp $
 .\"
 .\" Copyright (c) 1998 The OpenBSD Project
@@ -381,11 +381,11 @@ Tsunami-based systems.
 .El
 .Sh LIST OF DEVICES
 A complete list of available devices is contained within the pages
-describing the system busses and controllers.
+describing the system buses and controllers.
 For example, a PCI device would be listed in the
 .Xr pci 4
 man page.
-The following busses and controllers list these devices:
+The following buses and controllers list these devices:
 .Pp
 .Bl -tag -width "cardbus(4)XX" -offset 3n -compact
 .It Xr eisa 4
diff --git a/share/man/man4/man4.amd64/intro.4 b/share/man/man4/man4.amd64/intro.4
index 5247369b6ef..831096f92b4 100644
--- a/share/man/man4/man4.amd64/intro.4
+++ b/share/man/man4/man4.amd64/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.28 2006/09/08 09:25:53 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.29 2006/10/28 10:26:26 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -89,11 +89,11 @@ The autoconfiguration system is described in
 .Xr autoconf 4 .
 .Sh LIST OF DEVICES
 A complete list of available devices is contained within the pages
-describing the system busses and controllers.
+describing the system buses and controllers.
 For example, a PCI device would be listed in the
 .Xr pci 4
 man page.
-The following busses and controllers list these devices:
+The following buses and controllers list these devices:
 .Pp
 .Bl -tag -width "cardbus(4)XX" -offset 3n -compact
 .It Xr cardbus 4
diff --git a/share/man/man4/man4.armish/intro.4 b/share/man/man4/man4.armish/intro.4
index cb82edabf22..e88e13f62f0 100644
--- a/share/man/man4/man4.armish/intro.4
+++ b/share/man/man4/man4.armish/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.2 2006/09/08 09:25:53 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.3 2006/10/28 10:26:26 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -90,11 +90,11 @@ The autoconfiguration system is described in
 A list of the supported devices is given below.
 .Sh LIST OF DEVICES
 A complete list of available devices is contained within the pages
-describing the system busses and controllers.
+describing the system buses and controllers.
 For example, a PCI device would be listed in the
 .Xr pci 4
 man page.
-The following busses and controllers list these devices:
+The following buses and controllers list these devices:
 .Pp
 .Bl -tag -width "cardbus(4)XX" -offset 3n -compact
 .It Xr pci 4
diff --git a/share/man/man4/man4.cats/intro.4 b/share/man/man4/man4.cats/intro.4
index 99a708575f5..a7f6d47e05b 100644
--- a/share/man/man4/man4.cats/intro.4
+++ b/share/man/man4/man4.cats/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.7 2006/09/08 09:25:53 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.8 2006/10/28 10:26:26 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -89,11 +89,11 @@ The autoconfiguration system is described in
 .Xr autoconf 4 .
 .Sh LIST OF DEVICES
 A complete list of available devices is contained within the pages
-describing the system busses and controllers.
+describing the system buses and controllers.
 For example, a PCI device would be listed in the
 .Xr pci 4
 man page.
-The following busses and controllers list these devices:
+The following buses and controllers list these devices:
 .Pp
 .Bl -tag -width "cardbus(4)XX" -offset 3n -compact
 .It Xr isa 4
diff --git a/share/man/man4/man4.hppa/intro.4 b/share/man/man4/man4.hppa/intro.4
index a4e28c005ad..ee709d82707 100644
--- a/share/man/man4/man4.hppa/intro.4
+++ b/share/man/man4/man4.hppa/intro.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: intro.4,v 1.14 2006/09/08 09:36:50 jmc Exp $
+.\" $OpenBSD: intro.4,v 1.15 2006/10/28 10:26:26 jmc Exp $
 .\"
 .\" Copyright (c) 2002,2003 Paul Weissmann
 .\" All rights reserved.
@@ -154,11 +154,11 @@ system characteristics.
 .El
 .Sh LIST OF DEVICES
 A complete list of available devices is contained within the pages
-describing the system busses and controllers.
+describing the system buses and controllers.
 For example, a PCI device would be listed in the
 .Xr pci 4
 man page.
-The following busses and controllers list these devices:
+The following buses and controllers list these devices:
 .Pp
 .Bl -tag -width "cardbus(4)XX" -offset ind -compact
 .It Xr cardbus 4
diff --git a/share/man/man4/man4.i386/intro.4 b/share/man/man4/man4.i386/intro.4
index 1f11a9f13af..1779e435bb6 100644
--- a/share/man/man4/man4.i386/intro.4
+++ b/share/man/man4/man4.i386/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.76 2006/09/08 09:25:53 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.77 2006/10/28 10:26:26 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -90,11 +90,11 @@ The autoconfiguration system is described in
 .Xr autoconf 4 .
 .Sh LIST OF DEVICES
 A complete list of available devices is contained within the pages
-describing the system busses and controllers.
+describing the system buses and controllers.
 For example, a PCI device would be listed in the
 .Xr pci 4
 man page.
-The following busses and controllers list these devices:
+The following buses and controllers list these devices:
 .Pp
 .Bl -tag -width "cardbus(4)XX" -offset 3n -compact
 .It Xr cardbus 4
diff --git a/share/man/man4/man4.mac68k/mainbus.4 b/share/man/man4/man4.mac68k/mainbus.4
index 4ab60640246..2fcde04bbbb 100644
--- a/share/man/man4/man4.mac68k/mainbus.4
+++ b/share/man/man4/man4.mac68k/mainbus.4
@@ -28,7 +28,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.
 .\"
-.\"	$OpenBSD: mainbus.4,v 1.6 2005/02/27 22:11:03 martin Exp $
+.\"	$OpenBSD: mainbus.4,v 1.7 2006/10/28 10:26:26 jmc Exp $
 .\"	$NetBSD: mainbus.4,v 1.1 1997/07/18 02:13:40 ender Exp $
 .\"
 .Dd July 2, 1997
@@ -45,7 +45,7 @@
 The
 .Nm
 interface serves as an abstraction used by the autoconfiguration
-system to help find and attach busses
+system to help find and attach buses
 .Pq e.g. the Tn NuBus expansion bus
 or devices
 connected to the
diff --git a/share/man/man4/man4.macppc/intro.4 b/share/man/man4/man4.macppc/intro.4
index ba3013870a1..bece5a97774 100644
--- a/share/man/man4/man4.macppc/intro.4
+++ b/share/man/man4/man4.macppc/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.45 2006/09/14 13:56:16 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.46 2006/10/28 10:26:26 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Peter Valchev.
 .\" All rights reserved.
@@ -86,11 +86,11 @@ The configuration system is described in
 .Xr autoconf 4 .
 .Sh LIST OF DEVICES
 A complete list of available devices is contained within the pages
-describing the system busses and controllers.
+describing the system buses and controllers.
 For example, a PCI device would be listed in the
 .Xr pci 4
 man page.
-The following busses and controllers list these devices:
+The following buses and controllers list these devices:
 .Pp
 .Bl -tag -width "cardbus(4)XX" -offset 3n -compact
 .It Xr adb 4
diff --git a/share/man/man4/man4.sgi/intro.4 b/share/man/man4/man4.sgi/intro.4
index 694d7e1d438..a7f8481282e 100644
--- a/share/man/man4/man4.sgi/intro.4
+++ b/share/man/man4/man4.sgi/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.7 2006/09/08 09:25:53 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.8 2006/10/28 10:26:26 jmc Exp $
 .\"     $NetBSD: intro.4,v 1.8 2004/02/10 16:54:19 wiz Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -150,11 +150,11 @@ O2 on-board MAC110 Ethernet
 .El
 .Pp
 A further list of available devices is contained within the pages
-describing the system busses and controllers.
+describing the system buses and controllers.
 For example, a PCI device would be listed in the
 .Xr pci 4
 man page.
-The following busses and controllers list these devices:
+The following buses and controllers list these devices:
 .Pp
 .Bl -tag -width "cardbus(4)XX" -offset 3n -compact
 .It Xr pci 4
diff --git a/share/man/man4/man4.sparc/qec.4 b/share/man/man4/man4.sparc/qec.4
index 1ab8345e872..c9733f925f5 100644
--- a/share/man/man4/man4.sparc/qec.4
+++ b/share/man/man4/man4.sparc/qec.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: qec.4,v 1.16 2006/09/09 21:58:24 jmc Exp $
+.\"     $OpenBSD: qec.4,v 1.17 2006/10/28 10:26:26 jmc Exp $
 .\"
 .\" Copyright (c) 1998 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -43,7 +43,7 @@ Ethernet controller (Sun part number SUNW,501-2655)
 or four
 .Xr qe 4
 Ethernet controllers (Sun part number SUNW,501-2062).
-This driver, like other busses, is not directly available to users.
+This driver, like other buses, is not directly available to users.
 In essence it is a buffering DMA controller.
 .Sh SEE ALSO
 .Xr be 4 ,
diff --git a/share/man/man4/man4.sparc64/intro.4 b/share/man/man4/man4.sparc64/intro.4
index b7bf6d1a0cb..5dfbbf5f495 100644
--- a/share/man/man4/man4.sparc64/intro.4
+++ b/share/man/man4/man4.sparc64/intro.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: intro.4,v 1.54 2006/09/09 16:50:48 jmc Exp $
+.\"     $OpenBSD: intro.4,v 1.55 2006/10/28 10:26:26 jmc Exp $
 .\"
 .\" Copyright (c) 2001-2002 The OpenBSD Project
 .\" All Rights Reserved.
@@ -66,11 +66,11 @@ The autoconfiguration system is described in
 .Xr autoconf 4 .
 .Sh LIST OF DEVICES
 A complete list of available devices is contained within the pages
-describing the system busses and controllers.
+describing the system buses and controllers.
 For example, a PCI device would be listed in the
 .Xr pci 4
 man page.
-The following busses and controllers list these devices:
+The following buses and controllers list these devices:
 .Pp
 .Bl -tag -width "cardbus(4)XX" -offset 3n -compact
 .It Xr ebus 4
diff --git a/share/man/man4/man4.sparc64/qec.4 b/share/man/man4/man4.sparc64/qec.4
index 9c3b8d98d79..7bf2ddf642b 100644
--- a/share/man/man4/man4.sparc64/qec.4
+++ b/share/man/man4/man4.sparc64/qec.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: qec.4,v 1.8 2006/09/09 21:58:24 jmc Exp $
+.\"     $OpenBSD: qec.4,v 1.9 2006/10/28 10:26:26 jmc Exp $
 .\"
 .\" Copyright (c) 1998 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -43,7 +43,7 @@ Ethernet controller (Sun part number SUNW,501-2655)
 or four
 .Xr qe 4
 Ethernet controllers (Sun part number SUNW,501-2062).
-This driver, like other busses, is not directly available to users.
+This driver, like other buses, is not directly available to users.
 In essence it is a buffering DMA controller.
 .Sh SEE ALSO
 .Xr be 4 ,
diff --git a/share/man/man4/man4.zaurus/intro.4 b/share/man/man4/man4.zaurus/intro.4
index a5b68ce0d79..a29cb2cafca 100644
--- a/share/man/man4/man4.zaurus/intro.4
+++ b/share/man/man4/man4.zaurus/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.9 2006/09/08 09:25:53 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.10 2006/10/28 10:26:26 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -140,11 +140,11 @@ System touch-screen.
 .El
 .Pp
 A further list of available devices is contained within the pages
-describing the system busses and controllers.
+describing the system buses and controllers.
 For example, a PCMCIA device would be listed in the
 .Xr pcmcia 4
 man page.
-The following busses and controllers list these devices:
+The following buses and controllers list these devices:
 .Pp
 .Bl -tag -width "cardbus(4)XX" -offset 3n -compact
 .It Xr pcmcia 4
diff --git a/share/man/man4/pchb.4 b/share/man/man4/pchb.4
index 583329f42cf..8e05910a14c 100644
--- a/share/man/man4/pchb.4
+++ b/share/man/man4/pchb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pchb.4,v 1.15 2006/09/28 23:59:58 jmc Exp $
+.\"	$OpenBSD: pchb.4,v 1.16 2006/10/28 10:26:26 jmc Exp $
 .\"
 .\" Michael Shalayeff, 2000. Public Domain.
 .\"
@@ -18,9 +18,9 @@ driver provides support for PCI-Host adapter-specific functions.
 Support is provided for the following devices:
 .Bl -tag -width Ds -offset indent
 .It i450 PCIset (Orion)
-Supports additional PCI busses.
+Supports additional PCI buses.
 .It Reliance Computer ROSB4, CNB20HE, CNB20LE
-Supports additional PCI busses.
+Supports additional PCI buses.
 .It i82424ZX (Saturn)
 Disables CPU-PCI write posting.
 .It i82443BX
diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4
index f024b698a6c..8f277775e36 100644
--- a/share/man/man4/scsi.4
+++ b/share/man/man4/scsi.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scsi.4,v 1.27 2006/08/13 07:56:37 steven Exp $
+.\"	$OpenBSD: scsi.4,v 1.28 2006/10/28 10:26:26 jmc Exp $
 .\"
 .\" Copyright (c) 1996
 .\"	Julian Elischer <julian@freebsd.org>.  All rights reserved.
@@ -50,7 +50,7 @@ of drivers to control various scsi devices, and to utilize different
 scsi host adapters through host adapter drivers.
 When the system probes the
 .Em SCSI
-busses, it attaches any devices it finds to the appropriate
+buses, it attaches any devices it finds to the appropriate
 drivers.
 If no driver seems appropriate, then it attaches the device to the
 uk (unknown) driver so that user level scsi ioctls may
@@ -58,7 +58,7 @@ still be performed against the device.
 .Sh KERNEL CONFIGURATION
 The option SCSIDEBUG enables the debug ioctl.
 .Pp
-All devices and the SCSI busses support boot time allocation so that
+All devices and the SCSI buses support boot time allocation so that
 an upper number of devices and controllers does not need to be configured;
 .Cd "sd* at scsibus?"
 will suffice for any number of disk drivers.
diff --git a/share/man/man5/files.conf.5 b/share/man/man5/files.conf.5
index 4b35d95c495..8f05664cb79 100644
--- a/share/man/man5/files.conf.5
+++ b/share/man/man5/files.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: files.conf.5,v 1.13 2006/08/14 06:59:47 jsg Exp $
+.\"	$OpenBSD: files.conf.5,v 1.14 2006/10/28 10:26:26 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Miodrag Vallat.
 .\" All rights reserved.
@@ -84,7 +84,7 @@ interrupt vector.
 This attachment information is known as the
 .Dq locators
 for the device.
-Most of the busses support default values for unspecified locators, for devices
+Most of the buses support default values for unspecified locators, for devices
 that either do not require them
 .Po
 such as
diff --git a/share/man/man9/autoconf.9 b/share/man/man9/autoconf.9
index b07223ed6a2..3547a1a5fc6 100644
--- a/share/man/man9/autoconf.9
+++ b/share/man/man9/autoconf.9
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: autoconf.9,v 1.6 2004/02/14 17:54:02 jmc Exp $
+.\"     $OpenBSD: autoconf.9,v 1.7 2006/10/28 10:26:26 jmc Exp $
 .\"     $NetBSD: autoconf.9,v 1.9 2002/02/13 08:18:35 ross Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
 Autoconfiguration is the process of matching hardware devices with an
 appropriate device driver.
 In its most basic form, autoconfiguration consists of the recursive
-process of finding and attaching all devices on a bus, including other busses.
+process of finding and attaching all devices on a bus, including other buses.
 .Pp
 The autoconfiguration framework supports
 .Em direct configuration
diff --git a/share/man/man9/bus_dma.9 b/share/man/man9/bus_dma.9
index 2458c912cba..b4f53cda07a 100644
--- a/share/man/man9/bus_dma.9
+++ b/share/man/man9/bus_dma.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bus_dma.9,v 1.23 2006/05/27 00:29:55 krw Exp $
+.\"	$OpenBSD: bus_dma.9,v 1.24 2006/10/28 10:26:26 jmc Exp $
 .\" $NetBSD: bus_dma.9,v 1.14 2000/06/14 06:49:19 cgd Exp $
 .\"
 .\" Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -223,7 +223,7 @@ If this flag is specified,
 .Fn bus_dmamap_load
 will not block on resource allocation.
 .It Dv BUS_DMA_BUS[1-4]
-These flags are placeholders, and may be used by busses to provide
+These flags are placeholders, and may be used by buses to provide
 bus-dependent functionality.
 .El
 .It Fa dmamp
@@ -312,7 +312,7 @@ It is safe to wait (sleep) for resources during this call.
 .It Dv BUS_DMA_NOWAIT
 It is not safe to wait (sleep) for resources during this call.
 .It Dv BUS_DMA_BUS[1-4]
-These flags are placeholders, and may be used by busses to provide
+These flags are placeholders, and may be used by buses to provide
 bus-dependent functionality.
 .It Dv BUS_DMA_STREAMING
 By default, the
@@ -645,7 +645,7 @@ The
 .Dv BUS_DMA_STREAMING
 flag will never relax the constraints specified in the call.
 .It Dv BUS_DMA_BUS[1-4]
-These flags are placeholders, and may be used by busses to provide
+These flags are placeholders, and may be used by buses to provide
 bus-dependent functionality.
 .El
 .El
@@ -731,7 +731,7 @@ It is safe to wait (sleep) for resources during this call.
 .It Dv BUS_DMA_NOWAIT
 It is not safe to wait (sleep) for resources during this call.
 .It Dv BUS_DMA_BUS[1-4]
-These flags are placeholders, and may be used by busses to provide
+These flags are placeholders, and may be used by buses to provide
 bus-dependent functionality.
 .It Dv BUS_DMA_COHERENT
 This flag is a
@@ -820,7 +820,7 @@ It is safe to wait (sleep) for resources during this call.
 .It Dv BUS_DMA_NOWAIT
 It is not safe to wait (sleep) for resources during this call.
 .It Dv BUS_DMA_BUS[1-4]
-These flags are placeholders, and may be used by busses to provide
+These flags are placeholders, and may be used by buses to provide
 bus-dependent functionality.
 .It Dv BUS_DMA_COHERENT
 See
diff --git a/share/man/man9/bus_space.9 b/share/man/man9/bus_space.9
index 2f700ac154a..5d6fcbf6c3e 100644
--- a/share/man/man9/bus_space.9
+++ b/share/man/man9/bus_space.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bus_space.9,v 1.16 2005/08/23 08:25:06 jmc Exp $
+.\"	$OpenBSD: bus_space.9,v 1.17 2006/10/28 10:26:26 jmc Exp $
 .\" $NetBSD: bus_space.9,v 1.15 2000/08/09 03:11:00 tv Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -359,7 +359,7 @@ devices on different system architectures, and to allow a single driver
 object file to manipulate a set of devices on multiple bus types on a
 single architecture.
 .Pp
-Not all busses have to implement all functions described in this
+Not all buses have to implement all functions described in this
 document, though that is encouraged if the operations are logically
 supported by the bus.
 Unimplemented functions should cause compile-time errors if possible.
@@ -382,7 +382,7 @@ machine-dependent code.
 A given machine may have several different types of bus space (e.g.\&
 memory space and I/O space), and thus may provide multiple different bus
 space tags.
-Individual busses or devices on a machine may use more than one bus
+Individual buses or devices on a machine may use more than one bus
 space tag.
 For instance, ISA devices are given an ISA memory space tag and an ISA
 I/O space tag.
@@ -393,7 +393,7 @@ interface chipsets.
 A range in bus space is described by a bus address and a bus size.
 The bus address describes the start of the range in bus space.
 The bus size describes the size of the range in bytes.
-Busses which are not byte addressable may require use of bus space
+Buses which are not byte addressable may require use of bus space
 ranges with appropriately aligned addresses and properly rounded sizes.
 .Pp
 Access to regions of bus space is facilitated by use of bus space
@@ -409,7 +409,7 @@ argument, at least one handle argument, and at least one offset argument
 The bus space tag specifies the space, each handle specifies a region in
 the space, and each offset specifies the offset into the region of the
 actual location(s) to be accessed.
-Offsets are given in bytes, though busses may impose alignment constraints.
+Offsets are given in bytes, though buses may impose alignment constraints.
 The offset used to access data relative to a given handle must be such
 that all of the data being accessed is in the mapped region that the
 handle describes.
@@ -816,7 +816,7 @@ The
 and
 .Fn bus_space_write_N
 families of functions provide the ability to read and write 1, 2, 4, and
-8 byte data items on busses which support those access sizes.
+8 byte data items on buses which support those access sizes.
 .Pp
 .Bl -ohang -compact
 .It Fn bus_space_read_1 "space" "handle" "offset"