typos and consistency fixes;

ok miod@

29 files changed, 98 insertions, 98 deletions

diff --git a/distrib/notes/INSTALL b/distrib/notes/INSTALL
index 7378eef5aae..b7264ab921c 100644
--- a/distrib/notes/INSTALL
+++ b/distrib/notes/INSTALL
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: INSTALL,v 1.37 2003/09/06 22:11:19 miod Exp $
+dnl	$OpenBSD: INSTALL,v 1.38 2004/03/16 08:24:59 jmc Exp $
 include(INCLUDE/../m4.common)dnl
 INSTALLATION NOTES for OpenBSD/MACHINE OSREV
 
@@ -10,7 +10,7 @@ OpenBSD is a fully functional, multi-platform UN*X-like Operating
 System based on Berkeley Networking Release 2 (Net/2) and 4.4BSD-Lite.
 There are several operating systems in this family, but OpenBSD
 differentiates itself by putting security and correctness first.  The
-OpenBSD team strives to achieve what is called 'a secure by default'
+OpenBSD team strives to achieve what is called a 'secure by default'
 status.  This means that an OpenBSD user should feel safe that their
 newly installed machine will not be compromised.  This 'secure by
 default' goal is achieved by taking a proactive stance on security.
@@ -46,7 +46,7 @@ Because OpenBSD is from Canada, the export of Cryptography pieces
 the US.  Because of this, take care NOT to get the distribution from
 an FTP server in the US if you are outside of Canada and the US.)
 
-A comprehensive list of the improvewents brought by the OSREV release
+A comprehensive list of the improvements brought by the OSREV release
 is available on the web at http://www.OpenBSD.org/OSrev.html.
 
 includeit(whatis)dnl
diff --git a/distrib/notes/alpha/hardware b/distrib/notes/alpha/hardware
index 1329167ad3d..1821ff01d43 100644
--- a/distrib/notes/alpha/hardware
+++ b/distrib/notes/alpha/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.38 2004/01/01 01:52:11 deraadt Exp $
+dnl	$OpenBSD: hardware,v 1.39 2004/03/16 08:24:59 jmc Exp $
 OpenBSD/MACHINE OSREV is expected to run on the following hardware.
 If you have hardware that is listed here and are unable to run
 OpenBSD, or if you are able to run OpenBSD on hardware not listed
@@ -472,10 +472,10 @@ work. It's our best guess that they do, but any feedback is appreciated.
 		S3 SonicVibes (sv)
 
 Drivers for hardware marked with "[*]" are NOT included on the installation
-floppies, but are available in the cd-rom installation kernel as well as the
+floppies, but are available in the CD-ROM installation kernel as well as the
 GENERIC kernel which will be installed.
 Drivers for hardware marked with "[-]" are NOT available on the installation
-floppies, or the cdrom installation kernel, but are available in the GENERIC
+floppies, or the CD-ROM installation kernel, but are available in the GENERIC
 kernel which will be installed.
 
 Console frame buffers and keyboards are only supported on systems
diff --git a/distrib/notes/alpha/install b/distrib/notes/alpha/install
index 9c03129636d..a6e0a6da17d 100644
--- a/distrib/notes/alpha/install
+++ b/distrib/notes/alpha/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.22 2003/03/24 11:33:56 miod Exp $
+dnl	$OpenBSD: install,v 1.23 2004/03/16 08:24:59 jmc Exp $
 OpenBSDInstallPrelude
 
 dnl XXX document mopbooting from the SRM console.
@@ -19,8 +19,8 @@ Booting from Floppy Disk installation media:
 	than a minute.  If some action doesn't eventually happen,
 	or the spinning cursor has stopped and nothing further has
 	happened, or the machine spontaneously reboots, then either
-	either you have a bad boot floppy (in which case you should
-	try another) or your alpha is not currently supported by OpenBSD.
+	you have a bad boot floppy (in which case you should try
+	another) or your alpha is not currently supported by OpenBSD.
 
 Booting from CD-ROM installation media:
 
diff --git a/distrib/notes/amd64/upgrade b/distrib/notes/amd64/upgrade
index 5dfba36776e..43995e073b5 100644
--- a/distrib/notes/amd64/upgrade
+++ b/distrib/notes/amd64/upgrade
@@ -1,5 +1,5 @@
-dnl	$OpenBSD: upgrade,v 1.2 2004/02/07 22:47:49 miod Exp $
+dnl	$OpenBSD: upgrade,v 1.3 2004/03/16 08:24:59 jmc Exp $
 Since OpenBSD/OSREV is the first MACHINE release, there is no upgrade
-functionnality.
+functionality.
 dnl OpenBSDUpgrade({:-the CD-ROM or an installation floppy as you would do for
 dnl a new installation-:})
diff --git a/distrib/notes/cats/install b/distrib/notes/cats/install
index e82d003b73f..aae5ade9db0 100644
--- a/distrib/notes/cats/install
+++ b/distrib/notes/cats/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.5 2004/02/15 23:24:07 miod Exp $
+dnl	$OpenBSD: install,v 1.6 2004/03/16 08:24:59 jmc Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk.  The easiest way
@@ -9,7 +9,7 @@ Booting from CD-ROM installation media:
 
 At the ABLE firmware prompt, enter :
     > (cd0)bsd.rd
-to boot from the first detected cd-rom drive. If the cd-rom drive has not
+to boot from the first detected CD-ROM drive. If the CD-ROM drive has not
 been detected, be sure to put a disk in the tray, and reset the machine.
 
 
diff --git a/distrib/notes/cats/upgrade b/distrib/notes/cats/upgrade
index 76db79a926b..ef4371270a3 100644
--- a/distrib/notes/cats/upgrade
+++ b/distrib/notes/cats/upgrade
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: upgrade,v 1.2 2004/02/08 23:12:14 miod Exp $
+dnl	$OpenBSD: upgrade,v 1.3 2004/03/16 08:24:59 jmc Exp $
 Since OpenBSD/OSREV is the first MACHINE release, there is no upgrade
-functionnality.
+functionality.
 dnl OpenBSDUpgrade({:-the CD-ROM-:})
diff --git a/distrib/notes/cats/xfer b/distrib/notes/cats/xfer
index b03a3ee8b22..ff1d7d82986 100644
--- a/distrib/notes/cats/xfer
+++ b/distrib/notes/cats/xfer
@@ -1,7 +1,7 @@
-dnl	$OpenBSD: xfer,v 1.3 2004/02/13 11:00:24 miod Exp $
+dnl	$OpenBSD: xfer,v 1.4 2004/03/16 08:24:59 jmc Exp $
 Installation is supported from several media types, including:
 
-	CDROM
+	CD-ROM
 	FFS partitions
 	DOS (FAT) partitions
 	EXT2 partitions
diff --git a/distrib/notes/hp300/install b/distrib/notes/hp300/install
index 16d957c4d6d..2bc5049d39a 100644
--- a/distrib/notes/hp300/install
+++ b/distrib/notes/hp300/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.25 2003/03/25 19:57:18 miod Exp $
+dnl	$OpenBSD: install,v 1.26 2004/03/16 08:25:00 jmc Exp $
 OpenBSDInstallPrelude
 dnl No extra line, this has to stick to the geometry notes paragraph.
 The file `HP-IB.geometry' has geometry information for several HP-IB
@@ -91,7 +91,7 @@ OpenBSDInstallPart2
 	(which is likely to be `bsd.rd').
 
 	It will take a while to load the kernel especially from a slow
-	speed cdrom or slow network connection, most likely more than
+	speed CD-ROM or slow network connection, most likely more than
 	a minute.  If some action doesn't eventually happen, or the
 	spinning cursor has stopped and nothing further has happened,
 	either your boot media is bad, your diskless setup is incorrect,
diff --git a/distrib/notes/hppa/install b/distrib/notes/hppa/install
index 8b2d2983de5..4f94693c156 100644
--- a/distrib/notes/hppa/install
+++ b/distrib/notes/hppa/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.5 2004/01/20 17:48:37 miod Exp $
+dnl	$OpenBSD: install,v 1.6 2004/03/16 08:25:00 jmc Exp $
 dnl lots of texts coming from {mac68k,mvme68k,vax}/install initially
 OpenBSDInstallPrelude
 
@@ -50,7 +50,7 @@ center (unless you are using a serial console). There is only one interactive
 mode, with a BOOT_ADMIN> prompt, which provides both boot settings and
 commands.
 
-In this case, you will need to setup either bootpd or dhcpd on the server.
+In this case, you will need to set up either bootpd or dhcpd on the server.
 Assuming a bootp setup, start by editing the /etc/bootptab on the bootserver,
 and declare an information block. Here is an example:
 
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index f3d73743f07..8caa82c2726 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.144 2004/03/15 22:24:58 grange Exp $
+dnl	$OpenBSD: hardware,v 1.145 2004/03/16 08:25:00 jmc Exp $
 OpenBSD/MACHINE OSREV works across a broad range of standard PC's and
 clones, with a wide variety of processors and I/O bus architectures.  It
 can be expected to install and run with minimal difficulties on most
@@ -764,7 +764,7 @@ Supported hardware {:-include-:}:
 
 Drivers for hardware marked with [G] are only included in the GENERIC
 kernels, but are NOT included on the various distribution floppies
-(including the cd-rom boot image).
+(including the CD-ROM boot image).
 Drivers for hardware marked with [A] are not included in floppy A.
 Drivers for hardware marked with [B] are not included in floppy B.
 Drivers for hardware marked with [C] are not included in floppy C.
@@ -930,8 +930,8 @@ Special care for SMC Elite Ultra:
 	'default' location the kernel is expecting it, you may also use
 	the 'change' command in the UKC system to modify where the kernel
 	will look for it.  Typing 'change we1' will allow you to modify
-	those settings.  Note that running the card at an i/o port of
-	anything other then 0x300 at this point is not recommended, and is
+	those settings.  Note that running the card at an I/O port of
+	anything other than 0x300 at this point is not recommended, and is
 	beyond the scope of this document-- by doing so you risk other
 	device probes wreaking the havoc we are trying to avoid.
 
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index 7178d168038..42da4205164 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.52 2004/03/08 22:32:06 miod Exp $
+dnl	$OpenBSD: m4.common,v 1.53 2004/03/16 08:24:59 jmc Exp $
 dnl
 dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -368,7 +368,7 @@ define({:-OpenBSDInstallNet-:},
 	configuration used by the system after the installation is complete.
 
 	If you select to configure the network, the install program will
-	ask you for a name of your system and the DNS domain name to use.
+	ask you for the name of your system and the DNS domain name to use.
 	Note that the host name should be without the domain part, and that
 	the domain name should NOT {:-include-:} the host name part.
 
@@ -383,7 +383,7 @@ define({:-OpenBSDInstallNet-:},
 	any.  In doubt, do not enter any media flags; or you can refer to
 	the manual page for your interface for the appropriate flags.
 
-	After all network interfaces has been configured the install pro-
+	After all network interfaces have been configured the install pro-
 	gram will ask for a default route and IP address of the primary
 	name server to use.  You will also be presented with an opportunity
 	to edit the host table.
@@ -551,7 +551,7 @@ define({:-OpenBSDDISKInstall-:},
 
 		You will also have to identify the type of file system
 		residing in the partition identified.  Currently, you can
-		$2{:--:}install from partitions that has been formatted as the
+		$2{:--:}install from partitions that have been formatted as the
 		Berkeley fast file system (ffs)$3.
 
 		You will also have to provide the relative path to the
diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install
index ef1cadf8d4f..fcff38ff09f 100644
--- a/distrib/notes/mac68k/install
+++ b/distrib/notes/mac68k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.24 2004/03/15 08:37:25 xsa Exp $
+dnl	$OpenBSD: install,v 1.25 2004/03/16 08:25:00 jmc Exp $
 OpenBSDInstallPrelude
 
 The installation can be broken down into four basic steps:
@@ -139,7 +139,7 @@ files, all of which are in the /etc directory:
 	dhclient.conf	dhcp client information.
 
 Once these files are configured, your system will be very much like any
-other OpenBSD system.  'mygate' and 'myname' are just single-line  text
+other OpenBSD system.  'mygate' and 'myname' are just single-line text
 files, for info on the others, see hostname.if(5), resolv.conf(5), hosts(5)
 and dhclient.conf(5) in the OpenBSD man pages.
 
diff --git a/distrib/notes/macppc/install b/distrib/notes/macppc/install
index 2a44747ffb5..42686293043 100644
--- a/distrib/notes/macppc/install
+++ b/distrib/notes/macppc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.19 2004/03/15 08:37:25 xsa Exp $
+dnl	$OpenBSD: install,v 1.20 2004/03/16 08:25:00 jmc Exp $
 OpenBSDInstallShortPrelude
 
 Before you begin, you should decide if OpenBSD is to be installed
@@ -18,7 +18,7 @@ OpenBSDInstallPart2
 
 	At this time, the system can be installed from the supplied
 	CD-ROM boot image, by network loading the bootloader or loading
-	the bootloader and kernel from a HFS partition.
+	the bootloader and kernel from an HFS partition.
 
 	Once the bootloader is installed on the local hard drive, the
 	system can boot from it. OpenBSD may share a drive with Mac OS
diff --git a/distrib/notes/macppc/xfer b/distrib/notes/macppc/xfer
index 923d2df438c..8f4e2cef687 100644
--- a/distrib/notes/macppc/xfer
+++ b/distrib/notes/macppc/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.8 2003/09/06 22:38:35 miod Exp $
+dnl	$OpenBSD: xfer,v 1.9 2004/03/16 08:25:00 jmc Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
@@ -11,12 +11,12 @@ Installation is supported from several media types, including:
 OpenBSDXferShortPrelude
 
 OpenBSD now can be booted from a CD-ROM by holding down the 'c' key
-during reboot. If ofwboot and bsd.rd are copied to a HFS partition, it
+during reboot. If ofwboot and bsd.rd are copied to an HFS partition, it
 is possible to boot from those files.  Then install the rest of the files
 from any of the above sources.
 
 Note: Once a OpenBSD partition exists, it is not possible to load the
-kernel (bsd.rd) from a HFS partition on that disk.
+kernel (bsd.rd) from an HFS partition on that disk.
 
 
 OpenBSDXferBareTape(xbase xfont xserv xshare)
diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install
index 819ed4b2e32..4536d533667 100644
--- a/distrib/notes/mvme68k/install
+++ b/distrib/notes/mvme68k/install
@@ -1,12 +1,12 @@
-dnl	$OpenBSD: install,v 1.24 2004/02/09 13:32:47 todd Exp $
+dnl	$OpenBSD: install,v 1.25 2004/03/16 08:25:00 jmc Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
 in terms of preliminary setup is to use the OpenBSD ramdisk kernel that can
 be booted from tape.
 
-Alternatively, if the MACHINE is hooked up in a network, it is possible
-to setup another machine as a server for diskless setup, which is a
+Alternatively, if the MACHINE is hooked up to a network, it is possible
+to set up another machine as a server for diskless setup, which is a
 convenient way to install on a machine whose disk does not currently
 hold a usable operating system.
 This is difficult to get set up correctly the first time, but easy to
@@ -79,7 +79,7 @@ even if its controller is not supported by OpenBSD.
 
 Installing using a diskless setup:
 
-First, a diskless client configuration should be setup on a server. If
+First, a diskless client configuration should be set up on a server. If
 the boot server is an OpenBSD system, the diskless(8) manual page will
 provide detailed information on the process.
 
@@ -123,7 +123,7 @@ If the BUG does not support the NIOT command (most MVME147 don't), then
 it has no support for netbooting, and you'll have to use S-Records,
 described later in this document.
 
-Before netbooting, enter "NIOT" and fill the parametrs. Be sure to provide
+Before netbooting, enter "NIOT" and fill the parameters. Be sure to provide
 the correct values for Controller LUN and Device LUN (as listed in the
 "NIOT;A" output); also the "Boot File Load Address" and "Boot File
 Execution Address" need to be set to 006F0000. The "Boot File Name" must
@@ -174,9 +174,9 @@ will prevent the OpenBSD kernel from probing the built-in SCSI controller
     167-Bug> IOI;C
     167-Bug> IOI
 
-This can take up to a couple of minutes, depending how many SCSI controllers
-are found in the machine. Once the BUG prompt is back, you can safely
-netboot:
+This can take up to a couple of minutes, depending on how many SCSI
+controllers are found in the machine. Once the BUG prompt is back, you can
+safely netboot:
 	
     167-Bug> NBO 00 00
 
@@ -195,7 +195,7 @@ MVME147 don't), the alternative is to boot from S-Records.
 
 Booting from S-Records:
 
-First, a diskless client configuration should be setup on a server. Refer
+First, a diskless client configuration should be set up on a server. Refer
 to the short description above for details.
 
 Second, using a terminal emulator able to read files from the local machine
@@ -205,7 +205,7 @@ S-Records receive mode, with the LO command at the BUG prompr:
 
     147-Bug> LO
 
-If this command prints an error messages and returns to the BUG prompt
+If this command prints an error message and returns to the BUG prompt
 immediately, it might be necessary to switch directories, using the SD
 command, before retrying.
 
@@ -222,7 +222,7 @@ S-Records boot loader. This is a very crude bootloader which will attempt
 to fetch a secondary boot program via TFTP requests, like the NBO command.
 
 This will cause the kernel provided by the diskless setup to be booted.
-After the initial probe messages you'll asked to start the install
+After the initial probe messages you'll be asked to start the install
 or upgrade procedure.
 
 
@@ -307,7 +307,7 @@ After the boot program has been loaded into memory and given control by
 the BUG, it starts locating the machine's remote root directory through
 the BOOTPARAM protocol. First a BOOTPARAM WHOAMI request is broadcast
 on the local net. The answer to this request (if it comes in) contains
-the client's name. This name is used in next step, a BOOTPARAM GETFILE
+the client's name. This name is used in the next step, a BOOTPARAM GETFILE
 request -- sent to the server that responded to the WHOAMI request --
 requesting the name and address of the machine that will serve the client's
 root directory, as well as the path of the client's root on that server.
diff --git a/distrib/notes/mvme68k/prep b/distrib/notes/mvme68k/prep
index b263fd5ac5e..4623d3b4a66 100644
--- a/distrib/notes/mvme68k/prep
+++ b/distrib/notes/mvme68k/prep
@@ -1,9 +1,9 @@
-dnl	$OpenBSD: prep,v 1.6 2003/09/06 23:34:00 miod Exp $
+dnl	$OpenBSD: prep,v 1.7 2004/03/16 08:25:00 jmc Exp $
 Before installing OpenBSD on your machine, you will want to check your
 machine's NVRAM settings, from the BUG.
 
 The BUG provides a simple syntax reminder for every command, as well as
-description of the commands; if you need help, just use
+a description of the commands; if you need help, just use
 
     167-Bug> HE
 
diff --git a/distrib/notes/mvme88k/install b/distrib/notes/mvme88k/install
index 1674af541c9..0171fe98666 100644
--- a/distrib/notes/mvme88k/install
+++ b/distrib/notes/mvme88k/install
@@ -1,12 +1,12 @@
-dnl	$OpenBSD: install,v 1.15 2004/02/09 13:32:50 todd Exp $
+dnl	$OpenBSD: install,v 1.16 2004/03/16 08:25:00 jmc Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
 in terms of preliminary setup is to use the OpenBSD ramdisk kernel that can
 be booted from tape.
 
-Alternatively, if the MACHINE is hooked up in a network, it is possible
-to setup another machine as a server for diskless setup, which is a
+Alternatively, if the MACHINE is hooked up to a network, it is possible
+to set up another machine as a server for diskless setup, which is a
 convenient way to install on a machine whose disk does not currently
 hold a usable operating system.
 This is difficult to get set up correctly the first time, but easy to
@@ -94,7 +94,7 @@ controller. The tftp bootloader does not have this limitation and will boot
 from any BUG-supported ethernet controller.
 
 If you plan to use the Sun-compatible bootloader, "netboot", it will be
-necessary to setup a complete diskless client configuration on a server. If
+necessary to set up a complete diskless client configuration on a server. If
 the boot server is an OpenBSD system, the diskless(8) manual page will
 provide detailed information on the process.
 
@@ -277,7 +277,7 @@ After the boot program has been loaded into memory and given control by
 the BUG, it starts locating the machine's remote root directory through
 the BOOTPARAM protocol. First a BOOTPARAM WHOAMI request is broadcast
 on the local net. The answer to this request (if it comes in) contains
-the client's name. This name is used in next step, a BOOTPARAM GETFILE
+the client's name. This name is used in the next step, a BOOTPARAM GETFILE
 request -- sent to the server that responded to the WHOAMI request --
 requesting the name and address of the machine that will serve the client's
 root directory, as well as the path of the client's root on that server.
diff --git a/distrib/notes/pegasos/prep b/distrib/notes/pegasos/prep
index 17ec095a2ea..1231215bea0 100644
--- a/distrib/notes/pegasos/prep
+++ b/distrib/notes/pegasos/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.5 2004/02/07 14:28:32 miod Exp $
+dnl	$OpenBSD: prep,v 1.6 2004/03/16 08:25:00 jmc Exp $
 To be able to boot the OpenBSD/MACHINE installation program, you will
 need to acquire some limited knowledge of OpenFirmware, the low-level
 process that controls the microprocessor after hardware initialization
@@ -71,7 +71,7 @@ disks are recognized, but can't be modified to define new partitions at the
 moment.
 
 OpenBSD/MACHINE is capable of booting from a dedicated disk using a
-MBR partitioned disk, CD containing a ISO image or a firmware supported
+MBR partitioned disk, CD containing an ISO image or a firmware supported
 ethernet card.
 
 For dedicated disks, the MACHINE port boots off a boot program in
diff --git a/distrib/notes/pegasos/xfer b/distrib/notes/pegasos/xfer
index db50dafa92a..6e03801a7a7 100644
--- a/distrib/notes/pegasos/xfer
+++ b/distrib/notes/pegasos/xfer
@@ -1,7 +1,7 @@
-dnl	$OpenBSD: xfer,v 1.2 2003/11/03 13:58:38 miod Exp $
+dnl	$OpenBSD: xfer,v 1.3 2004/03/16 08:25:00 jmc Exp $
 Installation is supported from several media types, including:
 
-	CDROM
+	CD-ROM
 	FFS partitions
 	FTP
 	HTTP
diff --git a/distrib/notes/sparc/hardware b/distrib/notes/sparc/hardware
index 5a56c4db474..ea6fb1da4ee 100644
--- a/distrib/notes/sparc/hardware
+++ b/distrib/notes/sparc/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.59 2004/02/29 21:56:43 miod Exp $
+dnl	$OpenBSD: hardware,v 1.60 2004/03/16 08:25:00 jmc Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of machines:
     * sun4: the VME series
 	- 4/100: Original sparc with VME. Many hardware bugs.
@@ -18,7 +18,7 @@ OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- ELC: SS2-performance built into a B&W monitor
 
     * sun4m:
-	- 600MP: The original Sun4m machine. This is a mbus machine with
+	- 600MP: The original Sun4m machine. This is an mbus machine with
 	  SBus and VME busses.
 	- LC: 50MHz MicroSPARC-1 based machines (aka Classic)
 	- LX: LC with a few more devices
@@ -287,7 +287,7 @@ OpenBSD/MACHINE OSREV does NOT run on these machines (yet):
 	- clones that are significantly different from the Sun systems
 		(e.g. K-Bus based Solbourne)
 
-Hardware the we do NOT currently support, but get many questions about:
+Hardware that we do NOT currently support, but get many questions about:
     * Serial Cards:
         - VME mti 16-port serial card
         - VME alm2 16-port serial card
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index ff435f12979..23d14405be4 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.59 2004/02/09 13:32:51 todd Exp $
+dnl	$OpenBSD: install,v 1.60 2004/03/16 08:25:00 jmc Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -7,11 +7,11 @@ be booted off your local disk's swap partition. The normal way is to
 use the OpenBSD CD-ROM, or the bootable CD-ROM mini image, or an
 installation floppy, or an installation tape, depending on your hardware.
 
-If your Sparc is hooked up in a network and you can find a server to
+If your Sparc is hooked up to a network and you can find a server to
 arrange for a diskless setup, which is a convenient way to install on a
 machine whose disk does not currently hold a usable operating system.
 This is difficult to get set up correctly the first time, but easy to
-use afterwards.  (see ``Installing using a diskless setup'' below).
+use afterwards.  (See ``Installing using a diskless setup'' below.)
 
 It is also possible to install OpenBSD "manually" from a running SunOS
 or Solaris system, using the system tools, as well as gunzip (and gnu tar
@@ -54,7 +54,7 @@ There are four main cases:
 
 	
 If you expect your workstation to have an OpenBoot Prom but get a ">",
-enter then "n" command to enter the "new command mode".  You can set this
+enter the "n" command to enter the "new command mode".  You can set this
 as the default by doing a "setenv sunmon-compat? false" command, followed
 by a "reset" command.
 
@@ -141,7 +141,7 @@ accordingly:
 
 Installing using a diskless setup:
 
-First, you must setup a diskless client configuration on a server. If
+First, you must set up a diskless client configuration on a server. If
 you are using a OpenBSD system as the boot-server, have a look at the
 diskless(8) manual page for guidelines on how to proceed with this.
 If the server runs another operating system, you'll have to consult
@@ -183,7 +183,7 @@ OpenBSDBootMsgs
 
 	You will next be asked for your terminal type.  If you are
 	installing from a keyboard/monitor console, the default of
-	"sun" if correct.  If you are installing from a serial console
+	"sun" is correct.  If you are installing from a serial console
 	you should choose the terminal type from amongst those listed.
 	(If your terminal type is xterm, just use vt100).
 
@@ -273,7 +273,7 @@ partition sizes.  Here is an example layout:
     sd0h       400000   536000    /var/tmp
 
 Use SunOS to newfs the partitions which will have filesystems on them.
-(OpenBSD's filesystem format is almost identical to SunOS).
+(OpenBSD's filesystem format is almost identical to SunOS.)
 
     sunos# newfs /dev/rsd0a
     [... lots of output]
@@ -327,11 +327,11 @@ OpenBSD tar files are in the "new format" that includes directory
 information, and the standard SunOS tar will not extract from them
 successfully.
 
-After the files have been extracted, setup /mnt/etc/fstab to match
+After the files have been extracted, set up /mnt/etc/fstab to match
 your actual disk layout.  (Minus the "/mnt" component of each path, of
 course :-)
 
-Now proceed to reboot the machine and the customize your installation.
+Now proceed to reboot the machine and then customize your installation.
 
 
 Installing from Solaris:
@@ -417,11 +417,11 @@ The GNU gunzip program is not distributed as part of Solaris, but may be
 present in your /usr/local/bin.  If not, you will need to obtain it from a
 GNU archive and install before proceeding.
 
-After the files have been extracted, setup /mnt/etc/fstab to match
+After the files have been extracted, set up /mnt/etc/fstab to match
 your actual disk layout.  (Minus the "/mnt" component of each path, of
 course :-)
 
-Now proceed to reboot the machine and the customize your installation.
+Now proceed to reboot the machine and then customize your installation.
 
 
 Net Boot or Diskless Setup Information:
@@ -472,7 +472,7 @@ After the boot program has been loaded into memory and given control by
 the PROM, it starts locating the machine's remote root directory through
 the BOOTPARAM protocol. First a BOOTPARAM WHOAMI request is broadcast
 on the local net. The answer to this request (if it comes in) contains
-the client's name. This name is used in next step, a BOOTPARAM GETFILE
+the client's name. This name is used in the next step, a BOOTPARAM GETFILE
 request -- sent to the server that responded to the WHOAMI request --
 requesting the name and address of the machine that will serve the client's
 root directory, as well as the path of the client's root on that server.
diff --git a/distrib/notes/sparc/prep b/distrib/notes/sparc/prep
index 059f7b4061d..22082584e99 100644
--- a/distrib/notes/sparc/prep
+++ b/distrib/notes/sparc/prep
@@ -89,7 +89,7 @@ both OpenBSD and SunOS environments on the same system.
     Although untested, it is likely that SunOS would be confused by a
     filesystem with soft update flags enabled.
 
-The OpenBSD "Sun Compatible" disklabel have been extended to support 16
+The OpenBSD "Sun Compatible" disklabel has been extended to support 16
 partitions, which may be compatible with Solaris, but the old SunOS
 format(8) utility only sees the first 8 partitions and may "lose"
 information about the extended partitions.
diff --git a/distrib/notes/sparc/whatis b/distrib/notes/sparc/whatis
index 6a2f3204d3c..eab16d34838 100644
--- a/distrib/notes/sparc/whatis
+++ b/distrib/notes/sparc/whatis
@@ -2,5 +2,5 @@ OpenBSD/sparc OSREV is brought to you by the same people who did the first
 free BSD sparc port (based on Chris Torek's 4.4BSD work).  Many more sparc
 models and devices are now supported.
 
-In addition to the providing SunOS 4.1 compatibility, OpenBSD OSREV will
+In addition to providing SunOS 4.1 compatibility, OpenBSD OSREV will
 also run some number of SunOS 5 (SVR4) executables in binary emulation mode.
diff --git a/distrib/notes/sparc/xfer b/distrib/notes/sparc/xfer
index 4dec6e7ac2f..1591dae6204 100644
--- a/distrib/notes/sparc/xfer
+++ b/distrib/notes/sparc/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.36 2003/03/24 11:33:57 miod Exp $
+dnl	$OpenBSD: xfer,v 1.37 2004/03/16 08:25:00 jmc Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
@@ -11,7 +11,7 @@ Not all methods are supported on all Sparc Systems and some of them
 work only with the floppy or the miniroot installation.
 
 If you have the OpenBSD CD-ROM distribution (and a CD-ROM drive), you may be
-able boot from it, or from the supplied bootable CD-ROM mini image. However,
+able to boot from it, or from the supplied bootable CD-ROM mini image. However,
 not all sparc systems support booting from CD-ROM, and the current boot
 image is only known to work on sun4c and sun4m architecture workstations.
 If you can boot from the CD-ROM, you are home free and can proceed to the
@@ -43,7 +43,7 @@ Creating a bootable hard disk using SunOS, Solaris or other Un*x-like system:
 
 	Using the "b" partition allows you to boot without overwriting
 	any useful parts of the disk, you can also use another partition,
-	but don't used the "a" or "c" partition without understanding
+	but don't use the "a" or "c" partition without understanding
 	the disklabel issues described below under "incompatible systems".
 
 	This requires that you be running SunOS, Solaris, OpenBSD or NetBSD
@@ -59,7 +59,7 @@ Creating a bootable hard disk using SunOS, Solaris or other Un*x-like system:
 				- or -
 		dd if=miniroot{:--:}OSrev.fs of=/dev/rdsk/c0t0d0s1 bs=36b
 
-	The blocksize is arbitrary as long as it's a multiple of 512-bytes
+	The blocksize is arbitrary as long as it's a multiple of 512 bytes
 	and within the maximum supported by the driver, i.e. bs=126b may
 	not work for all cases.  Again, device/partition names may vary,
 	depending on the OS involved.
@@ -77,8 +77,8 @@ Creating a bootable hard disk using SunOS, Solaris or other Un*x-like system:
 	a partition that will be overwritten during the install process,
 	since it actually runs off a ram-disk image in the kernel.  In
 	contrast the miniroot is a normal unix root filesystem and you
-	must place in a partition that will not be overwritten until you've
-	completed the installation process.
+	must place it in a partition that will not be overwritten until
+	you've completed the installation process.
 
 	To copy the floppy image to the whole disk, overwriting labels:
 	Under SunOS:
@@ -91,7 +91,7 @@ Creating a bootable hard disk using SunOS, Solaris or other Un*x-like system:
 	current root partition.  Again names may vary depending on the
 	OS involved.  Second, after doing this, the disklabel will be one
 	that would be appropriate for a floppy, i.e. one partition of 2880
-	block, and you'll probably want to change that later on.
+	blocks, and you'll probably want to change that later on.
 
 	If you're starting with a virgin disk and trying to do this under
 	SunOS or Solaris, use format(8/1M) and newfs(8/1M) to set up the
diff --git a/distrib/notes/sparc64/hardware b/distrib/notes/sparc64/hardware
index f8fae4cf08c..1d0063a8ff5 100644
--- a/distrib/notes/sparc64/hardware
+++ b/distrib/notes/sparc64/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.62 2004/03/15 23:21:52 grange Exp $
+dnl	$OpenBSD: hardware,v 1.63 2004/03/16 08:25:00 jmc Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- SBUS based workstations:
 		Ultra 1
@@ -199,7 +199,7 @@ Supported devices {:-include-:}:
 
 Drivers for hardware marked with [A] are not included in the ramdisk.
 
-Hardware the we do NOT currently support, but get many questions about:
+Hardware that we do NOT currently support, but get many questions about:
 	Multiprocessor machines.
 	Floppy drive (except for booting).
 	SBUS and PCI cards other than those listed above.
diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install
index e0d2845fe00..f977f234d4a 100644
--- a/distrib/notes/sparc64/install
+++ b/distrib/notes/sparc64/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.32 2004/02/09 13:32:52 todd Exp $
+dnl	$OpenBSD: install,v 1.33 2004/03/16 08:25:00 jmc Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -7,11 +7,11 @@ dnl XXX change back if more than one floppy again.
 dnl cdrom, or an installation floppy.
 cdrom, or the installation floppy.
 
-If your machine is hooked up in a network and you can find a server to
+If your machine is hooked up to a network and you can find a server to
 arrange for a diskless setup, which is a convenient way to install on a
 machine whose disk does not currently hold a usable operating system.
 This is difficult to get set up correctly the first time, but easy to
-use afterwards.  (see ``Installing using a diskless setup'' below).
+use afterwards.  (See ``Installing using a diskless setup'' below.)
 
 It is also possible to install OpenBSD "manually" from a running Solaris
 system, using the system tools, as well as gunzip; see ``Installing from
@@ -83,14 +83,14 @@ which device it has been booted from.  In this case, it will ask you
 for the root and swap devices.  Answer the device and partition you
 booted from as the root partition (likely sd0b or wd0b); you might
 want to rely on the boot messages to find the correct device name
-(see below).  When the kernel asks your for the swap device, just
+(see below).  When the kernel asks you for the swap device, just
 validate the suggested device name; since the installation procedure
 does not use swap, it doesn't matter.
 
 
 Installing using a diskless setup:
 
-First, you must setup a diskless client configuration on a server. If
+First, you must set up a diskless client configuration on a server. If
 you are using a OpenBSD system as the boot-server, have a look at the
 diskless(8) manual page for guidelines on how to proceed with this.
 If the server runs another operating system, you'll have to consult
@@ -132,7 +132,7 @@ OpenBSDBootMsgs
 
 	You will next be asked for your terminal type.  If you are
 	installing from a keyboard/monitor console, the default of
-	"sun" if correct.  If you are installing from a serial console
+	"sun" is correct.  If you are installing from a serial console
 	you should choose the terminal type from amongst those listed.
 	(If your terminal type is xterm, just use vt100).
 
@@ -268,7 +268,7 @@ The GNU gunzip program is not distributed as part of Solaris, but may be
 present in your /usr/local/bin.  If not, you will need to obtain it from a
 GNU archive and install before proceeding.
 
-After the files have been extracted, setup /mnt/etc/fstab to match
+After the files have been extracted, set up /mnt/etc/fstab to match
 your actual disk layout.  (Minus the "/mnt" component of each path, of
 course :-)
 
@@ -305,7 +305,7 @@ After the boot program has been loaded into memory and given control by
 the PROM, it starts locating the machine's remote root directory through
 the BOOTPARAM protocol. First a BOOTPARAM WHOAMI request is broadcast
 on the local net. The answer to this request (if it comes in) contains
-the client's name. This name is used in next step, a BOOTPARAM GETFILE
+the client's name. This name is used in the next step, a BOOTPARAM GETFILE
 request -- sent to the server that responded to the WHOAMI request --
 requesting the name and address of the machine that will serve the client's
 root directory, as well as the path of the client's root on that server.
diff --git a/distrib/notes/sparc64/prep b/distrib/notes/sparc64/prep
index c7812a016f2..79b171f2a24 100644
--- a/distrib/notes/sparc64/prep
+++ b/distrib/notes/sparc64/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.14 2003/02/18 03:26:14 henric Exp $
+dnl	$OpenBSD: prep,v 1.15 2004/03/16 08:25:00 jmc Exp $
 If your UltraSPARC machine is somewhat old, it might need a firmware update
 before it can be used under OpenBSD. You are advised to try to install
 OpenBSD first; if it can't boot or fails mysteriously, you might need to
@@ -33,7 +33,7 @@ both OpenBSD and Solaris environments on the same system.
     Solaris would be confused by a filesystem with soft update flags
     enabled.
 
-The OpenBSD "Sun Compatible" disklabel have been extended to support 16
+The OpenBSD "Sun Compatible" disklabel has been extended to support 16
 partitions, which may be compatible with Solaris, but the Solaris
 format(1M) utility only sees the first 8 partitions and may "lose"
 information about the extended partitions.
diff --git a/distrib/notes/sparc64/xfer b/distrib/notes/sparc64/xfer
index d90c2a75b2f..73d48465bd8 100644
--- a/distrib/notes/sparc64/xfer
+++ b/distrib/notes/sparc64/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.19 2003/03/24 11:33:57 miod Exp $
+dnl	$OpenBSD: xfer,v 1.20 2004/03/16 08:25:00 jmc Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM (NOT supported if booting from floppy)
@@ -8,7 +8,7 @@ Installation is supported from several media types, including:
 	HTTP
 
 If you have the OpenBSD CD-ROM distribution (and a CD-ROM drive), you may be
-able boot from it, or from the supplied bootable CD-ROM mini image. If you
+able to boot from it, or from the supplied bootable CD-ROM mini image. If you
 can boot from the CD-ROM, you are home free and can proceed to the
 installation steps.  If not, you will need to do some setup work to prepare
 a bootable image, either a floppy, hard drive, or compatible net boot
diff --git a/distrib/notes/vax/hardware b/distrib/notes/vax/hardware
index 70fd16a22f6..90f95b23560 100644
--- a/distrib/notes/vax/hardware
+++ b/distrib/notes/vax/hardware
@@ -42,5 +42,5 @@ At the moment, the only supported console is a serial console.
 
 Currently, your storage options for using OpenBSD/MACHINE are SCSI disks
 or tapes on one of the supported controllers, disks and tapes accessed
-through an appropriate QBUS MSCP controller, or a NFS root and swap.
+through an appropriate QBUS MSCP controller, or an NFS root and swap.
 Please see below for details.