first cut

1 files changed, 10 insertions, 23 deletions

diff --git a/distrib/notes/i386/upgrade b/distrib/notes/i386/upgrade
index 35126ecefcf..61df886333d 100644
--- a/distrib/notes/i386/upgrade
+++ b/distrib/notes/i386/upgrade
@@ -1,13 +1,6 @@
-The upgrade to OpenBSD 1.1 is a binary upgrade; it would be prohibitive
-to make users upgrade by compiling and installing the 1.1 sources, and
-it would be very difficult to even compile a set of instructions that
-allowed them to do so.  Because of the many changes to the system, it
-is difficult impractical to upgrade by recompiling from the sources
-and installing.
-
 To do the upgrade, you must have the appropriate kernel-copy floppy
-image on a disk, and the upgr11.fs floppy image on another.  You must
-also have at least the "base11" binary distribution set available,
+image on a disk, and the upgr20.fs floppy image on another.  You must
+also have at least the "base20" 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
@@ -30,7 +23,7 @@ To upgrade your system, follow the following instructions:
 	"Boot" and ends with ":-"), hit return.
 
 	You will be prompted to insert a file system floppy.  Remove
-	the kernel-copy floppy and insert the upgr11 floppy, then hit
+	the kernel-copy floppy and insert the upgr20 floppy, then hit
 	any key to continue booting.
 
 	While booting, you will probably see several warnings.  You
@@ -91,13 +84,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 "base11" distribution set.  Once you
+	directory containing the "base20" 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 base11" to upgrade the base
+	Run the command "Extract base20" to upgrade the base
 	distribution.
 
 	Repeat the above two steps for all of the sets you wish to
@@ -116,8 +109,8 @@ 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 "upgr11" floppy from
-	the floppy drive, and replace it with the OpenBSD 1.1
+	When the system is halted, remove the "upgr20" floppy from
+	the floppy drive, and replace it with the OpenBSD 2.0
 	kernel-copy floppy that you previously booted from. Reboot
 	with that floppy.
 
@@ -146,21 +139,15 @@ To upgrade your system, follow the following instructions:
 	Once the system is halted, remove the kernel-copy floppy from
 	the floppy disk drive, and hit any key to reboot.
 
-Your system has now been upgraded to OpenBSD 1.1.
+Your system has now been upgraded to OpenBSD 2.0.
 
         After a new kernel has been copied to your hard disk, your
-	machine is a complete OpenBSD 1.1 system.  However, that
+	machine is a complete OpenBSD 2.0 system.  However, that
 	doesn't mean that you're finished with the upgrade process.
 	There are several things that you should do, or might have to
 	do, to insure that the system works properly.
 
-	First, if you did not upgrade your file systems to the new
-	file system format during the upgrade process, and you are
-        upgrading from a pre-1.0 OpenBSD, you may want to do so now,
-        with "fsck -c 2".  If you are unsure about the process, it's
-        suggested that you read the fsck(8) manual page.
-
-	Second, you will probably want to get the etc11 distribution,
+	Second, you will probably want to get the etc20 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