First few updates of install procedures on i386

3 files changed, 29 insertions, 63 deletions

diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index c09b9277f66..dc27bc876cf 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -11,53 +11,27 @@ out as follows:
 		floppies/	i386 boot and installation
 				floppies; see below.
 
-		utils/		Miscellaneous i386
-				installation utilities; see
-				installation section, below.
-
-There are four i386 floppy images to be found in the "i386/floppy"
-subdirectory of the OpenBSD 2.1 distribution.  Two of them are bootable
-kernel-copy floppies, one is an installation floppy, and one is an
-upgrade floppy.  They are all described in more detail below.  There
+		inst/		i386 boot/installation floppy;
+				miscellaneous i386 installation
+				utilities; see installation
+				section, below.
+
+There is one i386 floppy image to be found in the "i386/inst" sub-
+directory of the OpenBSD 2.1 distribution.  This is a bootable install
+floppy which can be used both to install and to upgrade an OpenBSD to
+the current version, as well as for maintenance work.  In addition there
+are some utilities that might be useful for the installation.  There
 are gzipped versions of each available, for easier downloading.  (The
 gzipped versions have the ".gz" extension added to their names.)
 
-Bootable Kernel-copy floppies:
-
-	These disks contain file systems, are bootable, and have
-	enough utilities on board to copy a new kernel to your hard
-	disk once you have it partitioned for OpenBSD.  They make
-	upgrading to a new kernel easy, because all you have to do is
-	get a new kernel-copy floppy with a new kernel, boot from it,
-	and confirm that you want to have the kernel copied to your
-	disk.
-
-        Please note that because of space considerations the kernel
-        copy floppies no longer contain drivers that are not needed
-        during installation -- in particular, no drivers needed to run
-        the X Window System are available in these kernels. It is
-        recommended that you configure a custom kernel following
-        installation.
-
-        For those that cannot configure a custom kernel, a "generic"
-        kernel image, named "bsd.gz" has been placed in the binaries
-	directory.  It is strongly encouraged that you build a custom
-        kernel for your installation rather than use a prebuilt generic
-        kernel.
-
-Installation floppy:
-
-	This disk contains the software necessary to prepare your hard
-	drive for OpenBSD and install the OpenBSD distribution. It is
-	not bootable, and must be used in conjunction with one of the
-	kernel-copy floppies.  This floppy is named "inst-21.fs".
-
-Upgrade floppy:
-
-	This disk contains the software to be used in upgrading the
-	system from a previous version of OpenBSD.  It is not bootable,
-	and must be used in conjunction with one of the kernel-copy
-	floppies.  This floppy is named "upgr21.fs"
+Bootable installation/upgrade floppy:
+
+	This disks contains a file system, is bootable, and have
+	enough utilities on board to prepare your hard disk drive
+	for OpenBSD and install the OpenBSD distribution.
+
+	It also holds the untilities needed in order to upgrade a
+	system to the current version of OpenBSD.
 
 The OpenBSD/i386 binary distribution sets contain the binaries which
 comprise the OpenBSD 2.1 release for the i386.  There are seven binary
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index ccba8740ef8..af610774c72 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -70,6 +70,7 @@ Supported devices include:
 		SMC/WD 8003, 8013, and the SMC "Elite16" ISA boards
 		SMC/WD 8216 (the SMC "Elite16 Ultra" ISA boards)  [X SEE BELOW]
 		Novell NE1000, NE2000
+		Digital DEFPA PCI FDDI adapters
 	Tape drives:
 		Most SCSI tape drives
 		QIC-02 and QIC-36 format (Archive- and Wangtek-
@@ -102,7 +103,7 @@ can use all of them by compiling a custom kernel once OpenBSD is
 installed.
 
 Support for devices marked with "[+]" IS included in the "generic" kernels,
-although it is not in the kernels which are on the distribution floppies.
+although it is not in the kernel on the installation floppy.
 
 
 Hardware the we do NOT currently support, but get many questions
@@ -119,9 +120,6 @@ about:
 	Multiprocessor Pentium and Pentium Pro systems.  (Though they should
 		run fine using one processor only.)
 	Intel EtherExpress 100 Fast Ethernet adapters.
-	Digital DEFPA PCI FDDI adapters (support barely missed this release;
-		it works in other ports, and will work in this one in the
-		next release)
 
 We are planning future support for many of these devices.
 
diff --git a/distrib/notes/i386/xfer b/distrib/notes/i386/xfer
index a68f7ac023c..9cfdbeea79b 100644
--- a/distrib/notes/i386/xfer
+++ b/distrib/notes/i386/xfer
@@ -1,17 +1,14 @@
 Installation is supported from several media types, including:
 
-	DOS floppies
+	DOS partitions
+	FFS partitions
 	Tape
 	Remote NFS partition
 	FTP
 	rsh & restore
 
 No matter which installation medium you choose, you'll need to have
-two floppy disks (either 1.2M or 1.44 will work, though both should be
-the same type).  On the first, you'll put the kernel-copy image that's
-appropriate for your system.  On the second, you'll put the install or
-upgrade floppy image, depending on whether you're installing OpenBSD
-for the first time, or upgrading a previous installation.
+a floppy disk (1.44Mb required).
 
 If you are using a UN*X-like system to write the floppy images to
 disks, you should use the "dd" command to copy the file system images
@@ -22,15 +19,12 @@ different from system to system, and a comprehensive list of the
 possibilities is beyond the scope of this document.
 
 If you are using DOS to write the floppy images to disks, you should
-use the "rawrite" utility, provided in the "i386/utilities" directory
-of the OpenBSD distribution.  It will write the file system images (.fs
-files) to disks.
-
-Note that, when installing, the kernel-copy floppy can be write-protected
-(i.e. read-only), but the install floppy MUST not be write-protected.
-The install program needs to write some temporary files, and if the
-disk is write-protected, it can't.  If you're upgrading your system,
-both the kernel-copy and upgrade floppies may be write-protected.
+use the "rawrite" utility, provided in the "i386/inst" directory of
+the OpenBSD distribution.  It will write the file system image (.fs
+file) to a disk.
+
+Note that, when installing, the floppy can be write-protected (i.e.
+read-only).
 
 Obviously, the steps necessary to prepare the distribution sets for
 installation or upgrade depend on which installation medium you