- fix a few typos in the hardware list and update it

- doesn't shout, improve style a bit
- mention you can boot from cd-rom. Really. Yes you can.
- don't support upgrades from prehistoric versions (< 2.0), so don't babble
  about the partition ID change or the so-called new shared libraries
- get more text sync'ed with other arches
And with the help of mickey@
- don't mention you can install over NFS, none of the floppies or the cd-rom
  has nfs support

Thanks to mickey@ for insightful feedback

6 files changed, 244 insertions, 342 deletions

diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index ece3dd490e7..2ccf389b2ee 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -20,7 +20,7 @@ OpenBSDbsd
 As well you may be interested in
 
 .../OSREV/tools/
-		miscellaneous i386 installation utilities like
+		miscellaneous MACHINE installation utilities like
 		rawrite.exe, ntrw.exe, gzip.exe, and pfdisk.exe; 
 		see installation section, below.
 
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index a04a8103147..16c3e4fafa7 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -19,7 +19,7 @@ of RAM, getting more RAM is more important than getting a faster CPU.)
  
 Supported hardware {:-include-:}:
 	Processors
-		All CPU chips compatible with the Intel 80386 (i386)
+		All CPU chips compatible with the Intel 80386 (MACHINE)
 		architecture:
 			386/486 (SX/DX/DX2/DX4)
 			Intel Pentium/Pentium-MMX
@@ -56,12 +56,13 @@ Supported hardware {:-include-:}:
 		YENTA-compatible PCI-CardBus bridges
 	Entropy Sources
 		Interrupt latency collection from many devices
-		INtel 82802 random number generator found on i810, i815,
+		Intel 82802 random number generator found on i810, i815,
 		i820, i840, i850 and i860 based systems.
 	Disk Controllers
 		Floppy controllers.
 		ISA MFM, ESDI, IDE, and RLL hard disk controllers.
 	PCI IDE Controllers
+		Acard ATP850, ATP860
 		Acer Labs M5229
 		Advanced Micro Devices 756, 766
 		CMD Tech PCI0640, PCI0643, PCI0646, PCI0648, and PCI0649
@@ -123,7 +124,8 @@ Supported hardware {:-include-:}:
 			Dell PERC 2/Si, PERC 2/QC, PERC 3/Si, PERC 3/Di,
 				PERC 3/QC
 			HP NetRAID-4M
-		American Megatrends Inc. MegaRAID controllers
+		American Megatrends Inc. MegaRAID controllers in "Mass
+		Storage" mode
 		Compaq Smart ARRAY PCI/EISA adapters, including:
 			Compaq Integrated Array
 			Compaq IAES
@@ -136,7 +138,11 @@ Supported hardware {:-include-:}:
 		DPT SmartCache and SmartRaid III/IV PCI/EISA adapters 
 		ICP-Vortex GDT 6XXXR[DNPS] series
 		I2O (intelligent I/O) RAID controllers, including:
-			Adaptec 2100S, 3200S 
+			Adaptec SCSI RAID (ASR-2100S, ASR-3200S, etc)
+			American Megatrends Inc. MegaRAID controllers
+			(in I2O mode)
+			and probably other vendors' controllers supporting
+			I2O, including Intel and Mylex (untested)
 	CD-ROM and DVD-ROM Drives
 		Mitsumi CD-ROM drives [*] [+]
 			[Note: The Mitsumi driver device probe is known 
@@ -148,7 +154,7 @@ Supported hardware {:-include-:}:
 		Most SCSI tape changers
 		QIC-02 and QIC-36 format (Archive- and Wangtek-
 	MDA, CGA, VGA, SVGA, and HGC Display Adapters.  (Note that not
-		all of the display adapters OpenBSD/i386 can work with
+		all of the display adapters OpenBSD/MACHINE can work with
 		are supported by X.  See the XFree86 FAQ for more
 		information.)
 	Serial Ports
@@ -334,9 +340,6 @@ Supported hardware {:-include-:}:
 		Winbond W89C840F Ethernet adapters, including:
 			Trendware TE100-PCIE
 			Compex RL100-ATX 10/100baseTX
-		Xircom 16-bit PCMCIA adapters, including:
-			Xircom CE3
-			Xircom Realport
 	Wireless Ethernet Adapters
 		Aironet 802.11DS PCMCIA and PCI
 		RayLink Aviator 2.4/Pro 802.11FH PCMCIA
@@ -352,6 +355,18 @@ Supported hardware {:-include-:}:
 			SGI Tigon
 		Intel i82452-based adapters, including:
 			Intel Pro/1000 Gigabit Server adapter
+		National Semiconductor DP83280 and DP83281 based PCI
+		adapters, including:
+			Addtron AEG320T
+			Asante FriendlyNet GigaNIX 1000TA and 1000TPC
+			D-Link DGE-500T
+			LinkSys EG1032 and EG1064
+			Netgear GA622T
+			SMC EZ Card 1000
+			Surecom Technology EP-320G-TX
+		Level1 LXT1001 based adapters (untested), including:
+			SMC TigerCard 1000
+			D-Link DGE-500SX
 		SysKonnect SK-9841/9842/9843/9844 Gigabit Ethernet
 			adapters
 	ATM Adapters
@@ -366,7 +381,7 @@ Supported hardware {:-include-:}:
 		Broadcom Bluesteelnet uBsec 5501, 5601, 5805, 5820
 		Hifn 7751-based boards, including:
 			GTGI PowerCrypt Encryption Accelerator
-			NETSEC 7751
+			NetSec 7751
 			Hifn reference board
 			Invertex AEON
 	PC Cards (PCMCIA and Carbus)
@@ -381,13 +396,13 @@ Supported hardware {:-include-:}:
 				3Com 3c574TX, 3c[CX]FE574BT
 				3Com 3c589, 3c589[BCDE]
 				3Com 3c575TX, 3c[CX]FE575[BC]T CardBus
-				3Com 3c[CX]FEM656, 3c[CX]656[BC] CardBus
+				3Com 3c[CX]FEM656, 3c[CX]FEM656[BC] CardBus
 			Intel/DEC 21443 "Tulip" clones, including:
 				ADMtex AN985 Centaur-C CardBus
 				IBM EtherJet 10/100 CardBus
 				SMC EZ CardBus 10/100
 				Xircom X3201 CardBus adapters, including
-				RealPort models
+					RealPort models
 			Intel i8255x-based, including:
 				Intel PRO/100 CardBus II
 			NE2000-based, including:
@@ -478,7 +493,7 @@ Supported hardware {:-include-:}:
 		Nearly all SMC-style Ethernet cards
 		Most serial port or modem cards
 		3c509 cards in PnP mode
-		NE2100 Etherent cards
+		NE2100 Ethernet cards
 
 Drivers for hardware marked with "[*]" are NOT included on the
 distribution floppies.  Except as noted above, all other drivers are
@@ -610,90 +625,92 @@ Hardware not listed in the above table doesn't need any specific
 configuration.
 
 
-SPECIAL CARE FOR SMC ULTRA ELITE
---------------------------------
-
-
-Note for SMC Elite Ultra ethernet card users:  The Elite Ultra is very
-sensitive to how its I/O port is treated.  Mistreating it can cause
-a number of effects -- everything from the card not responding when the
-kernel probes, or the soft configuration being corrupted or wiped completely.
-
-By default, the kernel ships with device we1 configured for the 'default'
-Elite Ultra locations, comprising of port 0x300, irq 10, and memory location
-0xcc000.  This matches a hard coded jumper on the board as well a common
-soft config setting.
-
-Unfortunately, the kernel's autoconfiguration process (specifically, some
-of the devices it probes for) cause conflicts with the SMC Elite Ultra, and
-very often cause it to lose its configuration and fail its own probe.
-If this happens, you must boot the computer into DOS, and run the EzSetup
-program from SMC (if you do not have a copy on the floppy
-accompanying your board, the complete URL to download the program 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 its
-configuration with a minimum of hassle.
-
-In order to avoid blowing away the card, one *must* use the run-time kernel
-configuration system when booting the Install kernel.  This is done by
-giving the -c flag to the initial boot request.  Following the loading of
-the kernel, the user is presented with a
-
-UKC>
-
-prompt.  At this prompt, a variety of commands may be issued, but the
-relevant one to getting the SMC Elite Ultra running is 'disable'.  The
-wt0, el0, and ie1 devices all need to be disabled.  This is done by typing
-'disable' followed by the name of the device, i.e., 'disable wt0', and
-pressing return.
-
-If, for some reason, your Elite Ultra is not configured at the '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 beyond the scope of this document-- by doing so you
-risk other device probes wreaking the havoc we are trying to avoid.
-
-When all three extra devices are disabled and any changes made, the
-'quit' command will exit the UKC.  The kernel should then boot, and find
-your Elite Ultra on device we1.
-
-SPECIAL CARE FOR PCI BIOS
+Special care for SMC Elite Ultra:
+
+	The Elite Ultra is very sensitive to how its I/O port is treated.
+	Mistreating it can cause a number of effects -- everything from
+	the card not responding when the kernel probes, or the soft
+	configuration being corrupted or wiped completely.
+
+	By default, the kernel ships with device we1 configured for the
+	'default' Elite Ultra locations, comprising of port 0x300, irq 10,
+	and memory location 0xcc000.  This matches a hard coded jumper on
+	the board as well a common soft config setting.
+
+	Unfortunately, the kernel's autoconfiguration process (specifically,
+	some of the devices it probes for) cause conflicts with the SMC
+	Elite Ultra, and very often cause it to lose its configuration and
+	fail its own probe.  If this happens, you must boot the computer
+	into DOS, and run the EzSetup program from SMC (if you do not have
+	a copy on the floppy accompanying your board, you can download it
+	from ftp://ftp.darmstadt.gmd.de/pub/pc/hardware/nic/smc/gez122.exe -
+	it is not available from SMC anymore).  This program will allow you
+	to reconfigure and recover a card that has lost its configuration
+	with a minimum of hassle.
+
+	In order to avoid blowing away the card, one *must* use the
+	run-time kernel configuration system when booting the Install
+	kernel.  This is done by giving the -c flag to the initial boot
+	request.  Following the loading of the kernel, the user is
+	presented with a
+
+	UKC>
+
+	prompt.  At this prompt, a variety of commands may be issued, but
+	the relevant one to getting the SMC Elite Ultra running is
+	'disable'.  The wt0, el0, and ie1 devices all need to be disabled.
+	This is done by typing 'disable' followed by the name of the
+	device, i.e., 'disable wt0', and pressing return.
+
+	If, for some reason, your Elite Ultra is not configured at the
+	'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
+	beyond the scope of this document-- by doing so you risk other
+	device probes wreaking the havoc we are trying to avoid.
+
+	When all three extra devices are disabled and any changes made,
+	the 'quit' command will exit the UKC.  The kernel should then
+	boot, and find your Elite Ultra on device we1.
+
+
+Special care for PCI BIOS:
  
-As all BIOS implementations and subsystems this one has bugs too.
-Sometimes specifications are unclear about interfaces and/or
-data validation.
-These all cause our driver for PCI BIOS to misbehave in more or
-less fatal ways, such as panics on pcibios0 configuration or
-pci device attachments, or unconfigured pci devices due to
-irq and/or I/O address misconfiguration.
-
-Fast workaround
-
-Boot by giving the -c flag to the initial boot request.
-Following the loading of the kernel, the user is presented with a
-
-UKC>
-
-Then type the following commands:
-
-UKC> change bios0
-165 bios0 at mainbus0 bus -1 flags 0x0
-change [n] y
-bus [-1] ? <enter>
-flags [0] ? 3
-165 bios0 changed
-165 bios0 at mainbus0 bus -1 flags 0x3
-UKC> quit
-
-This will disable the pcibios0 attachment.
-Sometimes, especially when hangs occur on particular pci device
-attachments, moving pci cards into a different slot helps.
-
-Fixing for good
-
-Try to gather dmesg output from the failing configuration, for
-example by using serial console (see boot(8)) and send it to
-mickey@openbsd.org along with descriptions of your hardware setup.
-Dig in the code and fix problems.
+	As all BIOS implementations and subsystems this one has bugs too.
+	Sometimes specifications are unclear about interfaces and/or data
+	validation.
+	These all cause our driver for PCI BIOS to misbehave in more or
+	less fatal ways, such as panics on pcibios0 configuration or pci
+	device attachments, or unconfigured pci devices due to irq and/or
+	I/O address misconfiguration.
+
+	Fast workaround
+
+	Boot by giving the -c flag to the initial boot request.
+	Following the loading of the kernel, the user is presented with a
+
+	UKC>
+
+	Then type the following commands:
+
+	UKC> change bios0
+	165 bios0 at mainbus0 bus -1 flags 0x0
+	change [n] y
+	bus [-1] ? <enter>
+	flags [0] ? 3
+	165 bios0 changed
+	165 bios0 at mainbus0 bus -1 flags 0x3
+	UKC> quit
+
+	This will disable the pcibios0 attachment.
+	Sometimes, especially when hangs occur on particular pci device
+	attachments, moving pci cards into a different slot helps.
+
+	Fixing for good
+
+	Try to gather dmesg output from the failing configuration, for
+	example by using serial console (see boot(8)) and send it to
+	mickey@openbsd.org along with descriptions of your hardware setup.
+	Alternatively, dig in the code and fix problems.
diff --git a/distrib/notes/i386/install b/distrib/notes/i386/install
index 6a35a56c74d..640d81db129 100644
--- a/distrib/notes/i386/install
+++ b/distrib/notes/i386/install
@@ -10,26 +10,29 @@ should use this geometry for the remainder of the install.  This is
 only necessary if you are sharing the disk with other operating systems
 that use the translated geometry.
 
+There are several ways to install OpenBSD onto a disk.  The easiest way,
+should your computer support it, is to boot off the CD-ROM.  Otherwise,
+you can boot from a 3.5" 1.44MB floppy disk.
+
 OpenBSDInstallPart2
 
-	Boot your machine using the floppy{:--:}OSrev.fs floppy.  When
-	presented with the boot prompt hit return.  If the boot prompt
-	does not appear in a reasonable amount of time, you either
-	have a bad boot floppy or a hardware problem.  Try writing the
-	floppy{:--:}OSrev.fs floppy image to a different disk, and using that.
-	If that doesn't work, try booting after disabling your CPU's
-	internal and external caches (if any).  If it still doesn't
-	work, OpenBSD probably can't be run on your hardware.  This can
-	probably be considered a bug, so you might want to report it.
+	With either the CD-ROM or the floppy in the drive, reboot your
+	computer. You might have to play with your BIOS options to let the
+	computer boot from the installation media, rather than the hard
+	disk.
+
+	It will take a while to load the kernel from a floppy or slow
+	speed CD-ROM drive, 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 floppy
+	is bad or you are having hardware problems. If trying another
+	floppy disk doesn't help, try booting after disabling your CPU's
+	internal and external caches (if any).  If it still doesn't work,
+	OpenBSD probably can't be run on your hardware.  This can probably
+	be considered a bug, so you might want to report it.
 	If you do, please {:-include-:} as many details about your system
 	configuration as you can.
 
-	It will take a while to load the kernel from the floppy,
-	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 floppy is
-	bad or you are having hardware problems, and should proceed
-	as outlined above.
 
 OpenBSDBootMsgs
 
@@ -119,7 +122,7 @@ OpenBSDBootMsgs
 	After all your file systems have been created, the install program
 	will give you an opportunity to configure the network.  The network
 	configuration you enter (if any) can then be used to do the install
-	from another system using NFS, HTTP or FTP, and will also be the
+	from another system using HTTP or FTP, and will also be the
 	configuration used by the system after the installation is complete.
 
 	If you select to configure the network, the install program will
@@ -151,7 +154,7 @@ OpenBSDBootMsgs
 
 	After these preparatory steps have been completed, you will be
 	able to extract the distribution sets onto your system.  There
-	are several install methods supported; FTP, HTTP, tape, CD-ROM, NFS
+	are several install methods supported; FTP, HTTP, tape, CD-ROM,
 	or a local disk partition.  To install from a tape, the distrib-
 	ution sets must have been written to tape prior to running the
 	installation program, either as tar images or as gzipped tar
@@ -166,8 +169,6 @@ OpenBSDTAPEInstall
 
 OpenBSDCDROMInstall
 
-OpenBSDNFSInstall
-
 OpenBSDDISKInstall({:-"wdN" or -:},,{:- or MS-DOS-:})
 
 OpenBSDCommonFS
diff --git a/distrib/notes/i386/prep b/distrib/notes/i386/prep
index fea91d62ccf..eabdb946b37 100644
--- a/distrib/notes/i386/prep
+++ b/distrib/notes/i386/prep
@@ -48,10 +48,9 @@ restore your important files from your backups.  Other operating
 systems will have different needs; most will need to reformat the
 partition, and if it was their "main" partition, will probably need
 to be reinstalled.
-
 Once you've backed all your data up, there is a tool called fips 2.0
-that can shrink your DOS/Windows/Windows95 partition to make room for
-OpenBSD.  It is included in the i386 tools area of this distribution as
+that can shrink your FAT-based DOS/Windows partition to make room for
+OpenBSD.  It is included in the MACHINE tools area of this distribution as
 a convenience.  It is strongly advised that you read its documentation
 and understand the consequences of your actions before using it.  In some
 cases, defragmenting your disk and running fips may be much faster than
diff --git a/distrib/notes/i386/upgrade b/distrib/notes/i386/upgrade
index b8ae5b1a840..597ee8788d7 100644
--- a/distrib/notes/i386/upgrade
+++ b/distrib/notes/i386/upgrade
@@ -1,132 +1,2 @@
-NOTE! If you are going to do the upgrade manually, you MUST use the "-r"
-flag when invoking disklabel(8).  You MUST also change the partition table
-such that partition 'c' encompasses the entire drive, and not only the
-OpenBSD partition.  Finally, partition 'd' is no longer special and can be
-used for any purpose whatsoever.
-
-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 other.
-
-To do the upgrade, you must have the floppy{:--:}OSrev.fs floppy image on a disk.
-You must also have at least the "base{:--:}OSrev" and "bsd" 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 being
-overwritten in place, you only need space for the new binaries, which
-weren't previously on the system.  If you have a few megabytes free on each
-of your root and /usr partitions, you should have enough space.
-
-Since upgrading involves replacing the boot blocks on your OpenBSD
-partition, the kernel, and most of the system binaries, it has the
-potential to cause data loss.  You are strongly advised to BACK UP ANY
-IMPORTANT DATA ON YOUR DISK, whether on the OpenBSD partition or on another
-operating system's partition, before beginning the upgrade process.
-
-  To upgrade your system, follow the following instructions:
-
-	Boot your machine using of the floppy{:--:}OSrev.fs floppy.  When presented
-	with the boot prompt (the "boot>" prompt), hit return.
-
-	While booting, you will probably see several warnings.  You should
-	be warned that no swap space is present.  Do not be alarmed,
-	these are completely normal.  When you reach the prompt asking
-	you for a shell name, just hit return.
-	
-	You will be presented with a welcome message and a prompt.  If you
-	are upgrading from a pre-OpenBSD 1.0 release, you should upgrade
-	your file systems manually now, using "fsck -c 2".  Read the
-	fsck(8) manual page for more details.
-	
-	Now you will be asked whether you wish to do an "install" or an
-	"upgrade".  Enter 'u' to upgrade your existing installation.  You
-	will be presented with some information about the upgrade process
-	and a warning message, and will be asked if you wish to proceed
-	with the upgrade process.  If you answer negatively, the upgrade
-	process will stop, and your disk will not be modified.  If you
-	answer affirmatively, the upgrade process will begin, and your disk
-	will be modified.  You may hit Control-C to stop the upgrade
-	process at any time.  However, if you hit it at an inopportune
-	moment, your system may be left in an inconsistent (and possibly
-	unusable) state.
-	
-	You will be asked which terminal type to use, you should just hit
-	return to select the default (pcvt25).
-
-	The upgrade program will then tell you which disks of that type it
-	can upgrade, and ask you which it should use.  The name of the disk
-	is typically "wd0" for IDE/RLL/ESDI/ST506 drives or "sd0" for SCSI
-	drives.  Reply with the name of your disk.
-	
-	The upgrade program will then ask you for the partition which
-	contains the root file system and proceed with checking it.  It
-	will then mount your root file system on /mnt.
-	
-	After all your root file system has been mounted, the upgrade
-	program will ask you if you want to enable the network.  If you
-	answer affirmatively, the configuration stored on the root file
-	system will be used.  After this you will be given the opportunity
-	to escape to the command shell to do any additional network
-	configuration.  This may {:-include-:} adding or altering routes, if
-	needed.
-	
-	At the next point you can edit the fstab, which is used for the
-	upgrade process.  You may need to resolve dependencies in the order
-	in which the file systems are mounted.  All partitions will be
-	checked and mounted under /mnt.  In other words, your root
-	partition will be mounted on /mnt, your /usr partition on /mnt/usr,
-	etc.
-
-	You will be asked if the upgrade sets are already on the mounted
-	file systems.  If you answer with yes, you can type in the path
-	where the sets are stored.  The upgrade then continues with the
-	procedure described in the paragraph "Common file system
-	installations" in the install section of this document.
-
-	If you don't already have the OpenBSD distribution sets on your
-	disk, look at the installation section of this document for
-	information on how to go on.  Your options are to install via FTP,
-	via HTTP, via nfs, from tape, from CD-ROM or, again, from local
-	disk.  But remember to not install the "etc{:--:}OSrev" distribution file!
-
-  Your system has now been upgraded to OpenBSD OSREV.
-
-	After rebooting your machine is a complete OpenBSD OSREV 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, you will probably want to get the etc{:--:}OSrev distribution,
-	extract it to a temporary location, 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 in the new versions into yours.
-
-	Second, you will probably want to update the set of device nodes
-	you have in /dev.  If you've changed the contents of /dev by hand,
-	you will need to be careful about this.  A "MAKEDEV all" was
-	already run during the upgrade procedure, so you will have to take
-	care about those devices, that are not remade by "MAKEDEV all".
-
-	Third, you must deal with certain changes in the formats of some of
-	the configuration files.  The most notable change is that the
-	"options" given to many of the file systems in /etc/fstab or by
-	hand have changed, and some of the file systems have changed names.
-	*IMPORTANT*: ANY INSTANCES OF "ufs" IN /etc/fstab ARE CHANGED TO
-	"ffs" BY THE UPGRADE PROGRAM. To find out what the new options are,
-	it's suggested that you read the manual page for the file systems'
-	mount commands, for example mount_nfs(8) for NFS. (Note that the
-	information for mounts of type "ffs", i.e.  Fast File Systems, are
-	contained in the mount(8) man page.)
-
-	Finally, you will want to delete old binaries that were part of the
-	version of OpenBSD that you upgraded from and have since been
-	removed from the OpenBSD distribution.  If you are upgrading from a
-	pre-1.0 OpenBSD, you might also want to recompile any locally-built
-	binaries, to take advantage of the shared libraries.  (Note that
-	any new binaries that you build will be dynamically linked, and
-	therefore take advantage of the shared libraries, by default.  For
-	information on how to make statically linked binaries, see the
-	cc(1) and ld(1) manual pages.)
+OpenBSDUpgrade({:-the CD-ROM or an installation floppy as you would do for
+a new installation-:})
diff --git a/distrib/notes/i386/xfer b/distrib/notes/i386/xfer
index a8c71ec7182..45ed14c7fda 100644
--- a/distrib/notes/i386/xfer
+++ b/distrib/notes/i386/xfer
@@ -4,101 +4,116 @@ Installation is supported from several media types, including:
 	FFS partitions
 	EXT2 partitions
 	Tape
-	Remote NFS partition
 	FTP
 	HTTP
 
-No matter which installation medium you choose, you'll need to have
+If you can't (or don't want to) boot off the CD-ROM, you'll need to have
 a floppy disk (1.44MB required).
 
-If you are using a UN*X-like system to write the floppy image to
-disk, you should use the "dd" command to copy the file system image
-(floppy{:--:}OSrev.fs) directly to the raw floppy disks.  It is suggested that
-you read the dd(1) manual page or ask your system administrator to
-determine the correct set of arguments to use; it will be slightly
-different from system to system, and a comprehensive list of the
-possibilities is beyond the scope of this document.
+The floppy installation allows installing OpenBSD directly from FTP
+mirror sites over the internet, however you must consider the speed and
+reliability of your internet connection for this option.  It may save
+much time and frustration to use ftp get/reget to transfer the
+distribution sets to a local server or disk and perform the installation
+from there, rather than directly on the internet.
+
+
+Creating a bootable floppy disk using DOS/Windows:
+
+	First you need to get access to the OpenBSD Bootable floppy
+	images.  If you can access the CD-ROM distribution under DOS
+	the bootable disks are in the OSREV/MACHINE directory, otherwise
+	you you will have to download them from one of the OpenBSD
+	ftp or http mirror sites, using ftp or a web-viewer.  In either
+	case, take care to do "binary" transfers, since these are
+	images files and any DOS cr/lf translations or control/z EOF
+	interpretations will result in corrupted transfers.
+	
+	You will also need to go to the "tools" directory and grab a
+	copy of the rawrite.exe utility and its documentation.  This
+	program is needed to correctly copy the bootable filesystem
+	image to the floppy, since it's an image of a unix partition
+	containing a ffs filesystem, not a MSDOS format diskette.
+
+	Once you have installed rawrite.exe, just run it and specify the
+	name of the bootable image, such as "floppy{:--:}OSrev.fs" and the name of
+	the floppy drive, such as "a:".  Be sure to use good quality HD
+	(1.44MB) floppies, formatted on the system you're using.  The
+	image copy and boot process is not especially tolerant of read
+	errors. 
+
+	Note that if you are using NT to write the images to disk, you
+	will need to use ntrw.exe instead.  It is also available in the
+	"tools" directory.  Grab it and run in with the correct 
+	arguments like this "ntrw <image> <drive>:"
+
+	Note that, when installing, the boot floppy can be write-protected
+	(i.e.  read-only).
+
+
+Creating a bootable floppy disk using SunOS or other Un*x-like system:
+
+	First, you will need obtain a local copy of the bootable filesystem
+	image as described above.  If possible use cksum or md5 to verify
+	the checksums of the images vs. the values in the CKSUM or MD5
+	files on the mirror site.
+
+	Next, use the dd(1) utility to copy the file to the floppy drive.
+	Under SunOS, the command would be:
+
+		dd if=floppy{:--:}OSrev.fs of=/dev/rfd0c bs=36b
+
+	If you are using something other than SunOS, you may have to adapt
+	this to conform to local naming conventions for the floppy and
+	options suitable for copying to a "raw" floppy image.  The key
+	issue is that the device name used for the floppy *must* be one
+	that refers to the whole 2880 block image, not a partition or
+	compatibility mode, and the copy command needs to be compatible
+	with the requirement that writes to a raw device must be in
+	multiples of 512-byte blocks.  The variations are endless and
+	beyond the scope of this document.
+
+	If you're doing this on the system you intend to boot the floppy on,
+	copying the floppy back to a file and doing a compare or checksum
+	is a good way to verify that the floppy is readable and free of
+	read/write errors.
+
+
+Creating an installation tape:
+
+	While you won't be able to boot OpenBSD from a tape, you can use
+	one to provide the installation sets.  To do so, you need to make
+	a tape that contains the distribution set files, each in "tar"
+	format or in "gzipped tar format".  First you will need to
+	transfer the distribution sets to your local system, using ftp or
+	by mounting the CD-ROM containing the release.  Then you need to
+	make a tape containing the files.
+
+	If you're making the tape on a UN*X-like system, the easiest way
+	to do so is make a shell script along the following lines, call it
+	"/tmp/maketape".
+
+	#! /bin/sh
+	tape=/dev/nrst0
+	mt -f ${tape} rewind
+	for file in base etc comp game man misc xbase xfont xlink xserv xshare
+	do
+		dd if=${file}OSrev.tgz of=${tape} obs=8k conv=sync
+	done
+	tar cf ${tape} bsd
+	mt -f ${tape} offline
+	# end of script
+
+
+	And then:
+
+	cd .../OSREV/MACHINE
+	sh -x /tmp/maketape
+
+	
+	If you're using a system other than OpenBSD or SunOS, the tape
+	name and other requirements may change.
 
-If you are using DOS to write the floppy image to disk, you should
-use the "rawrite" utility, provided in the "OSREV/tools" directory of
-the OpenBSD distribution.  It will write the file system image
-(floppy{:--:}OSrev.fs) to a disk.
-
-If you are using NT to write the floppy image to disk, you should
-use the "ntrw" utility, provided in the "OSREV/tools" directory of
-the OpenBSD distribution, instead
-
-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
-choose.  The steps for the various media types are outlined below.
-
-To install or upgrade OpenBSD using a tape, you need to do the
-following:
-
-	To install OpenBSD from a tape, you need to make a tape that
-	contains the distribution set files, in "tar" format.  If
-	you're making the tape on a UN*X-like system, the easiest way
-	to do so is probably something like:
-
-		tar cf <tape_device> <dist_directories>
-
-	where "<tape_device>" is the name of the tape device that
-	describes the tape drive you're using (possibly /dev/rst0, or
-	something similar, but it will vary from system to system.
-	(If you can't figure it out, ask your system administrator.)
-	In the above example, "<dist_directories>" are the
-	distribution sets' directories, for the distribution sets you
-	wish to place on the tape.  For instance, to put the "base{:--:}OSrev",
-	"etc{:--:}OSrev", and "bsd" distributions on tape (in order to do the
-	absolute minimum installation to a new disk), you would do the
-	following:
-
-		cd .../OSREV		# the top of the tree
-		cd MACHINE/
-		tar cf <tape_device> base{:--:}OSrev etc{:--:}OSrev bsd
-
-	(Note that you still need to fill in "<tape_device>" in the
-	example.)
-
-	Once you have the files on the tape, you can proceed to the
-	next step in the installation or upgrade process.  If you're
-	installing OpenBSD from scratch, go to the section on preparing
-	your hard disk, below.  If you're upgrading an existing
-	installation, go directly to the section on upgrading.
-
-To install or upgrade OpenBSD using a remote partition, mounted via
-NFS, you must do the following:
-
-	NOTE:	This method of installation is recommended only for
-		those already familiar with using BSD network
-		configuration and management commands.  If you aren't,
-		this documentation should help, but is not intended to
-		be all-encompassing.
-
-	Place the OpenBSD distribution sets you wish to install into a
-	directory on an NFS server, and make that directory mountable
-	by the machine on which you are installing or upgrading OpenBSD.
-	This will probably require modifying the /etc/exports file on
-	the NFS server and resetting its mount daemon (mountd).
-	(Both of these actions will probably require superuser
-	privileges on the server.)
-
-	You need to know the numeric IP address of the NFS server,
-	and, if the server is not on a network directly connected to
-	the machine on which you're installing or upgrading OpenBSD,
-	you need to know the numeric IP address of the router closest
-	to the OpenBSD machine.  Finally, you need to know the numeric
-	IP address of the OpenBSD machine itself.
-
-	Once the NFS server is set up properly and you have the
-	information mentioned above, you can proceed to the next step
-	in the installation or upgrade process.  If you're installing
-	OpenBSD from scratch, go to the section on preparing your hard
-	disk, below.  If you're upgrading an existing installation, go
-	directly to the section on upgrading.
 
 If you are upgrading OpenBSD, you also have the option of installing
 OpenBSD by putting the new distribution sets somewhere in your existing