typos.

4 files changed, 13 insertions, 14 deletions

diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index 7929278c366..92bef5aaadd 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -25,7 +25,7 @@ As well you may be interested in
 
 .../2.2/tools/
 		miscellaneous i386 installation utilities like
-		rawwrite.exe, gzip.exe, and pfdisk.exe; see
+		rawrite.exe, gzip.exe, and pfdisk.exe; see
 		installation section, below.
 
 
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index 9edf27b7e9b..ced67865797 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -246,7 +246,7 @@ soft config setting.
 Unfortunately, the kernel's autconfiguration process (specifically, some
 of the devices it probes for) cause conflicts with the SMC Elite Ultra, and
 very often cause it to lose it's configuration and fail it's own probe.
-If thise happens, you must boot the computer into DOS, and run the EzSetup
+If this happens, you must boot the computer into DOS, and run the EzSetup
 program available from SMC.  The complete URL of which is 
 ftp://ftp.smc.com/pub/nics/ethernet/elite_ultra/gez122.exe.  This program
 will allow you to reconfigure and recover a card that has lost it's
diff --git a/distrib/notes/i386/prep b/distrib/notes/i386/prep
index c50cd158eda..73ed0dac0a3 100644
--- a/distrib/notes/i386/prep
+++ b/distrib/notes/i386/prep
@@ -38,7 +38,7 @@ operating system.  If that operating system is already set up to use the
 entire disk, you will have to back it up, remove and recreate a smaller
 partition for it, and then restore the data from that partition.  You do
 not have to create an OpenBSD partition at this time, the OpenBSD install-
-ation will give you an oppotunity to create the partition needed for
+ation will give you an opportunity to create the partition needed for
 OpenBSD.
 
 Finally, do whatever is necessary to restore order to the partition
diff --git a/distrib/notes/i386/upgrade b/distrib/notes/i386/upgrade
index 3951aa129c0..510e9e06c76 100644
--- a/distrib/notes/i386/upgrade
+++ b/distrib/notes/i386/upgrade
@@ -8,11 +8,11 @@ Also, OpenBSD now uses partition ID 0xA6 (166 decimal), but will
 continue to work with 0xA5 for compatibility reasons.  However, if
 you change the partition ID to 0xA6, you will be able to share the
 disk with 386BSD, FreeBSD or NetBSD.  Note that the latter three can
-NOT easily share the disk with each others.
+NOT easily share the disk with each other.
 
 To do the upgrade, you must have the appropriate kernel-copy floppy
-image on a disk, and the upgr20.fs floppy image on another.  You must
-also have at least the "base20" binary distribution set available,
+image on a disk, and the floppy22.fs floppy image on another.  You must
+also have at least the "base22" binary distribution set available,
 so that you can upgrade with it, using one of the upgrade methods
 described above.  Finally, you must have sufficient disk space
 available to install the new binaries.  Since the old binaries are
@@ -31,18 +31,17 @@ process.
 To upgrade your system, follow the following instructions:
 
 	Boot your machine using of the appropriate kernel-copy floppy.
-	When presented with the boot prompt (the prompt begins with
-	"Boot" and ends with ":-"), hit return.
+	When presented with the boot prompt (the "boot>" prompt), hit return.
 
 	You will be prompted to insert a file system floppy.  Remove
-	the kernel-copy floppy and insert the upgr20 floppy, then hit
+	the kernel-copy floppy and insert the upgr22 floppy, then hit
 	any key to continue booting.
 
 	While booting, you will probably see several warnings.  You
 	should be warned that no swap space is present, and that
 	init(8) cannot find /etc/rc.  Do not be alarmed, these are
 	completely normal.  When you reach the prompt asking you for a
-	shell name, just hit return.
+	shell name, just hit return, then type 'upgrade'.
 
 	You will be presented with some information about the upgrade
 	process and a warning message, and will be asked if you wish
@@ -96,13 +95,13 @@ To upgrade your system, follow the following instructions:
 
 	After the software has been transferred to the machine (or
 	mounted, in the case of upgrading via NFS), change into the
-	directory containing the "base20" distribution set.  Once you
+	directory containing the "base22" distribution set.  Once you
 	are there, run the "Set_tmp_dir" command, and hit return at
 	the prompt to select the default answer for the temporary
 	directory's path name.  (It should be the path name of the
 	directory that you're in.)
 
-	Run the command "Extract base20" to upgrade the base
+	Run the command "Extract base22" to upgrade the base
 	distribution.
 
 	Repeat the above two steps for all of the sets you wish to
@@ -121,7 +120,7 @@ To upgrade your system, follow the following instructions:
 	up the installation, by remaking some system databases.  When
 	it is complete, you should use "halt" to halt the system.
 
-	When the system is halted, remove the "upgr20" floppy from
+	When the system is halted, remove the "upgr22" floppy from
 	the floppy drive, and replace it with the OpenBSD 2.2
 	kernel-copy floppy that you previously booted from. Reboot
 	with that floppy.
@@ -159,7 +158,7 @@ Your system has now been upgraded to OpenBSD 2.2.
 	There are several things that you should do, or might have to
 	do, to insure that the system works properly.
 
-	Second, you will probably want to get the etc20 distribution,
+	Second, you will probably want to get the etc22 distribution,
 	extract it, and compare its contents with those in your /etc/
 	directory.  You will probably want to replace some of your
 	system configuration files, or incorporate some of the changes