Reflect reality better

5 files changed, 413 insertions, 383 deletions

diff --git a/distrib/notes/amiga/contents b/distrib/notes/amiga/contents
index caf2102c032..fc1bb90c370 100644
--- a/distrib/notes/amiga/contents
+++ b/distrib/notes/amiga/contents
@@ -5,7 +5,9 @@ out as follows:
 .../2.1/amiga/
 		INSTALL.amiga	This file.
 
-		kernels/	A generic OpenBSD kernel is found here.
+		kernels/	A generic OpenBSD kernel, bsd, is found here
+				as well as a ramdisk OpenBSD kernel, called:
+				bsd.rd.
 
 		miniroots/	An amiga installation and upgrade
 				file system image; see below.
@@ -16,17 +18,17 @@ out as follows:
 		tars.split/	amiga binary distribution sets
 				splitted in 80k parts.
 
-		utils/		Miscellaneous amiga
-				installation utilities; see
-				installation section, below.
+		utils/	Miscellaneous amiga installation
+				utilities; see installation section, below.
 
 There is one amiga file system image to be found in the "amiga/miniroots"
 subdirectory of the OpenBSD 2.1 distribution.  It's a combined upgrade
-and installation image.  It's described in more detail below.  There is
-a gzipped version available, for easier downloading.  (The gzipped version
-has the ".gz" extension added to its name.)
+and installation image and should only be used if you cannot use the
+ramdisk installation method.  It's described in more detail below.
+There is a gzipped version available, for easier downloading.  (The
+gzipped version has the ".gz" extension added to its name.)
 
-Installation/upgrade file system:
+Installation/upgrade miniroot file system:
 
 	This file contains a BSD root file system setup to help
 	you install or upgrade the rest of OpenBSD.  This includes
@@ -101,7 +103,7 @@ the name given in the table below):
 The amiga binary distribution sets are distributed in the same form as
 the source distribution sets; catted together, the members of a set
 form a gzipped tar file.  Each amiga binary distribution set also has
-its own "CKSUMS" file, just as the source distribution sets do.
+its own "CKSUMS" & "MD5" file, just as the source distribution sets do.
 
 The instructions given for extracting the source sets work equally
 well for the binary sets, but it is worth noting that if you use that
diff --git a/distrib/notes/amiga/install b/distrib/notes/amiga/install
index 1ff44d1c69d..d3aa0894a39 100644
--- a/distrib/notes/amiga/install
+++ b/distrib/notes/amiga/install
@@ -11,9 +11,12 @@ installed on your hard disk.  If you wish to stop the installation,
 you may hit Control-C at any prompt, but if you do, you'll have to
 begin again from scratch.
 
-	Transfer the install miniroot filesystem onto the hard disk
-	partition used by OpenBSD for swapping, as described in the
-	"Preparing your System for OpenBSD Installation" section above.
+	If you have a small machine (less than 6MB of fast RAM) you'll
+	have to setup a miniroot filesystem in the swap partition, as
+	described in the "Preparing your System for OpenBSD Installation"
+	section above.  If your machine has 6MB or more we strongly
+	recommend using the ramdisk kernel instead.  This way you don't
+	need to setup any root image beforehand.
 
 	You then need to have "ixemul.library" in your LIBS: directory
 	on AmigaDOS.  You also need to have the "loadbsd" program
@@ -25,53 +28,72 @@ begin again from scratch.
 	Next you need to get yourself into OpenBSD by loading the
 	kernel from AmigaDOS with loadbsd like so:
 
+		loadbsd bsd.rd
+
+	or, if you are doing a miniroot install:
+
 		loadbsd -b bsd
 
+
 	If you have an AGA machine, and your monitor will handle
 	the dblNTSC mode, you may also include the "-A" option to
 	enable the dblNTSC display mode.
 
 	You should see the screen clear and some information about
 	your system as the kernel configures the hardware.  Note which
-	hard disk device(s) are configured (sd0, sd1, etc).  Then
-	you will be prompted for a root device.  At this time type
-	'sd0*', where '0' is the device which contains the swap
-	partition you created during the hard disk preparation.
-
-	If the system should hang after entering the root device, try
-	again with
+	hard disk device(s) are configured (sd0, sd1, etc).  You will
+	be asked for disknames later during the install.  If you cannot
+	read the messages as they scroll by, do not worry -- you can get
+	at this information later inside the install program.  If you
+	are doing the miniroot install you will be prompted for a root
+	device.  At this time type 'sd0*', where '0' is the device which
+	holds the miniroot-containing swap partition you created during
+	the hard disk preparation.  If the system should hang after
+	entering the root device, try again with
 
 		loadbsd -I ff -b bsd
 
-	This disables synchronous transfer on all SCSI devices.
-
-	The system should continue to boot.  For now ignore WARNING:
-	messages about bad dates in clocks.  Eventually you will be
-	asked to enter the pathname of the shell, just hit return.
-	After a short while you should see a welcome message and a
-	prompt, asking if you wish to proceed with the installation.
-
-	If you wish to proceed, enter "y" and then return.
-
-	If you have configured your hard drive[s] correctly it
-	should find the drive and partition that you selected to
-	use as your root.  You will be prompted for which device
-	you want to use for your root.  If you have multiple disks
-	present with root partitions defined, you will need to be
-	sure you enter the device name of the correct partition you
-	want to install OpenBSD on.
-
-	YOU ARE NOW AT THE POINT OF NO RETURN.  If you confirm that
-	you want to install OpenBSD, your hard drive will be modified,
-	and perhaps its contents scrambled at the whim of the install
-	program.
-
-	If you are sure you want to proceed, enter "yes" at the
-	prompt.
-
-	The install program will now make the root filesystem you
-	specified.  There should be only one error in this section
-	of the installation.  It will look like so:
+	This disables synchronous transfer on all SCSI devices.  For
+	ramdisk installations this kind of hang might occur later during
+	the install when accessing the SCSI disk for the first time.  If
+	such a hang occurs, try again with:
+
+		loadbsd -I ff bsd.rd
+
+	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.
+
+	You will be asked which terminal type to use, you should just
+	hit return to select the default (vt220).
+
+	The install program will then tell you which disks of that
+	type it can install on, and ask you which it should use.  The
+	name of the disk is typically "sd0" for SCSI drives or the
+	A4000 IDE drives or "wd0" for ISA-connected IDE drives.  Reply
+	with the name of your disk.
+
+	The install program will now ask which file systems should be
+	created on which partitions.  It will automatically select the
+	'a' partition to be the root file system. Next it will ask for
+	which disk and partition you want a file system created on.
+	This will be the same as the disk name (eg. "sd0") with the
+	letter identifying the partition (eg. "d") appended (eg.
+	"sd0d").  Then it will ask where this partition is to be
+	mounted, eg. /usr.  This process will be repeated until you
+	just hit return.
+
+	At this point you will be asked to confirm that the file system
+	information you have entered is correct, and given an opportunity
+	to change the file system table.  Next it will create the new file
+	systems as specified, OVERWRITING ANY EXISTING DATA.  This is the
+	point of no return.
+
+	The install program will now make the filesystems you specified.
+	There should be only one error in this section of the installation.
+	It will look like this:
 
 		newfs: ioctl (WDINFO): Invalid argument
 		newfs: /dev/rsd0a: can't rewrite disk label
@@ -81,259 +103,236 @@ begin again from scratch.
 	does not write disklabels currently.  You should expect
 	this error whenever using newfs.
 
-	Next the install program will ask you which drive and
-	partition you wish to use as /usr.  First it will list the
-	available drives.  Choose one.  Next it will give you a
-	list of the partitions on that disk along with their sizes,
-	types, etc..  Choose the letter that corresponds to the
-	partition you wish to use for /usr.  If you are doing a
-	full install this should be at the very least 45M-50M large.
-	If everything is ok the install program will then format
-	and mount your /usr.  If not then it will ask again for a
-	drive and partition.
-
-	When this completes your root partition will be mounted on
-	/mnt and your /usr partition on /mnt/usr.  An fstab will
-	have been created and initialized to correctly mount these
-	two file systems.  This fstab will be in /mnt/etc.
-
-	What you do from this point on depends on which media you're
-	using to install OpenBSD.  Follow the appropriate instructions,
-	given below.
-
-	To install from an AmigaDOS partition:
-
-		You first need to mount the AmigaDOS partition
-		using the mount_ados command.  If e.g. your AmigaDOS
-		partition is the first partition on sd0 you could
-		type:
-			
-			mkdir /mnt/ados
-			mount_ados -o ro /dev/sd0d /mnt/ados
-
-		You can use `disklabel sd0' to find out what types
-		of partitions are on the disk `sd0'.
-
-		Next goto the directory in which you stored the
-		distribution sets.  If e.g. you stored them in the
-		root directory of the partition:
-
-			cd /mnt/ados
-
-		When there, run "Set_tmp_dir" and choose the default
-		temporary directory, by hitting return at the
-		prompt.
-
-		Run the "Extract" command, giving it as its sole
-		argument the name of the distribution set you wish
-		to extract.  For example, to extract the base
-		distribution, use the command:
-
-			Extract base21
-
-		and to extract the games distribution:
-
-			Extract game21
-
-		If the distribution sets are in different directories,
-		you will need to cd to each directory in turn, runing
-		"Set_tmp_dir" and the appropriate "Extract" command(s).
-
-		Continue this process until you've finished installing
-		all of the sets which you desire to have on your
-		hard disk.  Once you have extracted all sets and
-		are at the "#" prompt again, proceed to the section
-		"Configuring Your System," below.
+	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
+	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.
+	Note that the host name should be without the domain part, and that
+	the domain name should NOT include the host name part.
+
+	Next the system will give you a list of network interfaces you can
+	configure.  For each network interface you select to configure, it
+	will ask for the IP address to use, the symbolic host name to use,
+	the netmask to use and any interface-specific flags to set.  The
+	interface-specific flags are usually used to determine which media
+	the network card is to use.  The flags usually carry the following
+	meaning:
+
+		-link0 -link1	Use BNC (coaxial) port [default]
+		link0 -link1	Use AUI port
+		link0 link1		Use UTP (twisted pair) port
+
+	After all network interfaces has 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.
+
+	At this point you will be allowed to edit the file system table
+	that will be used for the remainder of the installation and that
+	will be used by the finished system, following which the new file
+	systems will be mounted to complete the installation.
+
+	After these preparatory steps has 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
+	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
+	images.  Note that installation from floppies are not currently
+	supported.
+
+	To install via FTP:
+		To begin an FTP install you will need the following
+		pieces of information.  Don't be daunted by this list;
+		the defaults are sufficient for most people.
+		    1) Proxy server URL if you are using a URL-based
+		       ftp proxy (squid, CERN ftp, Apache 1.2 or higher).
+		       You need to define a proxy if you are behind a
+		       firewall that blocks outgoing ftp (assuming you
+		       have a proxy available to use).
+		    2) Do you need to use passive mode ftp?  Most modern
+		       ftp servers are capable of dealing with passive
+		       ftp connections.  You only need to enable this
+		       option if you are behind a firewall that allows
+		       outgoing ftp but blocks incoming tcp ports > 1023.
+		       If in doubt say yes to this option.
+		       Note that you will not be asked about passive
+		       ftp if you are using a proxy.
+		    3) The IP address (or hostname if you enabled
+		       DNS earlier in the install) of an ftp server
+		       carrying the OpenBSD 2.1 distribution.
+		       If you don't know, just hit return when
+		       asked if you want to see a list of such hosts.
+		    4) The ftp directory holding the distribution sets.
+		       The default value of pub/OpenBSD/2.1/amiga
+		       is almost always correct.
+		    5) The login and password for the ftp account.
+		       The default will be correct unless you are
+		       doing non-anonymous ftp.
+
+		For instructions on how to complete the installation via
+		ftp, see the section named "Common URL installations" below.
+
+	To install via HTTP:
+		To begin an HTTP install you will need the following
+		pieces of information:
+		    1) Proxy server URL if you are using a URL-based
+		       http proxy (squid, CERN ftp, Apache 1.2 or higher).
+		       You need to define a proxy if you are behind a
+		       firewall that blocks outgoing http connections
+		       (assuming you have a proxy available to use).
+		    3) The IP address (or hostname if you enabled
+		       DNS earlier in the install) of an http server
+		       carrying the OpenBSD 2.1 distribution.
+		       If you don't know, just hit return when
+		       asked if you want to see a list of such hosts.
+		    4) The directory holding the distribution sets.
+		       There is no standard location for this;
+		       You should use the directory specified
+		       along with the server in the list of official
+		       http mirror sites that you received in step 3.
+
+		For instructions on how to complete the installation via
+		http, see the section named "Common URL installations" below.
 
 	To install from tape:
-
-		The first thing you should do is pick a temporary
-		directory where the distribution files can be stored.
-		To do this, use the command "Set_tmp_dir" and enter
-		your choice.  The default is /mnt/usr/distrib.
-
-		After you have picked a temporary directory,
-		you should issue the load command:
-
-			Load_tape
-
-		Next, you will be told to insert the media into
-		the appropriate drive, and hit return.  Continue
-		to follow instructions until you are returned to
-		the "#" prompt.
-
-		Go to the directory which contains the first
-		distribution set you wish to install.  This is
-		either the directory you specified above, or possibly
-		a subdirectory of that directory.
-
-		When there, run "Set_tmp_dir" again, and choose
-		the default temporary directory, by hitting
-		return at the prompt.
-
-		Run the "Extract" command, giving it as its sole
-		argument the name of the distribution set you
-		wish to extract.  For example, to extract the base
-		distribution, use the command:
-
-			Extract base21
-
-		and to extract the games distribution:
-
-			Extract game21
-
-		After the extraction is complete, go to the location
-		of the next set you want to extract, "Set_tmp_dir"
-		again, and once again issue the appropriate
-		extract command.  Continue this process until
-		you've finished installing all of the sets which you
-		desire to have on your hard disk.
-
-		After each set is finished, if you know that you
-		are running low on space you can remove the
-		distribution files for that set by saying:
-
-			rm set_name.??
-
-		For example, if you wish to remove the distribution
-		files for the game21 set, after the "Extract game21"
-		command has completed, issue the command:
-
-			rm game21.??
-
-		Once you have extracted all sets and are at the "#" prompt
-		again, proceed to the section "Configuring Your System,"
-		below.
-
-	To install via FTP or NFS:
-
-		First, use Set_tmp_dir to pick a temporary directory
-		for the installation files.  /mnt/usr/distrib is
-		suggested.
-
-		Configure the appropriate ethernet interface i.e. le0
-		if you have a 2065 or ed0 if you have a AMIGNET from
-		Hydra Systems.
+		In order to install from tape, the distribution sets to be
+		installed must have been written to tape previously, either
+		in tar format or gzip-compressed tar format.
+
+		You will also have to identify the tape device where the
+		distribution sets are to be extracted from.  This will
+		typically be "nrst0" (no-rewind, raw interface).
+
+		Next you will have to provide the file number of the set
+		that is to be extracted.  Note that the file number starts
+		at 1, which is the first file written to the tape.
+
+		The install program will not automatically detect whether
+		an image has been compressed, so it will ask for that
+		information before starting the extraction.
+
+	To install from CD-ROM:
+		When installing from a CD-ROM, you will be asked which
+		device holds the distribution sets.  This will typically
+		be either "cd0" or "acd0".  Next you will be asked which
+		partition on the CD-ROM the distribution is to be loaded
+		from.  This is normally partition "a".
+
+		Next you will have to identify the file system type that
+		has been used to create the distribution on the CD-ROM,
+		this can be either FFS or ISO CD9660.  The OpenBSD CD
+		distribution uses the CD9660 format.
+
+		You will also have to provide the relative path to the
+		directory on the CD which holds the distribution, for the
+		amiga this is "2.1/amiga".
+
+		For instructions on how to complete the installation from
+		the CD-ROM distribution, see the section named "Common
+		file system installations" below.
 		
-			ifconfig <ifname> <ipaddr> [netmask <netmask>]
-
-		where <ifname> is the interface name (e.g. ed0, etc.),
-		and <ipaddr> is the numeric IP address of the interface.
-		If the interface has a special netmask, supply
-		the word "netmask" and that netmask at the end of the
-		command line.  For instance, without a special netmask:
-
-			ifconfig ed0 129.133.10.10
-
-		or with a special netmask
-
-			ifconfig ed0 128.32.240.167 netmask 0xffffff00
-
-		You should also be able to use SLIP or PPP as the network
-		connection.
-		[XXX instructions for ppp or slip would be usefull
-		perhaps the next release]
-
-		If the NFS server or FTP server is not on a directly-
-		connected network, you should set up a route to it
-		with the command:
-
-			route add default <gate_ipaddr>
-
-		where <gate_ipaddr> is your gateway's numeric IP address.
-
-		If you are NFS-mounting the distribution sets,
-		mount them on the temporary directory with the command:
-
-			mount -t nfs <serv_ipaddr>:<dist_dir> <tmp_dir>
-
-		where <serv_ipaddr> is the server's numeric IP address,
-		<dist_dir> is the path to the distribution files on
-		the server, and <tmp_dir> is the name of the local
-		temporary directory.
-
-		Once this is done, proceed as if you had loaded the
-		files from tape, "cd"ing to the appropriate directories
-		and running "Set_tmp_dir" and "Extract" as appropriate.
-
-		If you are retrieving the distribution sets using ftp,
-		cd into the temp directory, and execute the command:
-
-			ftp <serv_ipaddr>
-
-		where <serv_ipaddr> is once again the server's
-		numeric IP address.  Get the files with FTP,
-		taking care to use binary mode to transfer
-		all files.
-
-		Once you have all of the files for the distribution sets
-		you wish to install, you can proceed using the instructions
-		above as if you had installed the files from a tape.
-
-
-Configuring Your System:
------------ ---- ------
-
-Once you have finished extracting all of the distribution sets that
-you want on your hard drive and are back at the "#" prompt,
-you are ready to configure your system.
-
-The configuration utility expects that you have installed the base
-system.  If you have not, you will not be able to run it successfully
-(nor will you have a functional system regardless of configuration).
-
-To configure the newly installed operating system, run the
-command "Configure".
-
-Configure will ask for the machine's hostname, domain name, and other
-network configuration information.
-
-Once you have supplied `Configure' all that it requests, your machine
-will be configured well enough that when you reboot it it will
-almost be a completely functional OpenBSD system.
-
->>> Copy the kernel from the miniroot filesystem at this point <<<
-
-Once you are done with `Configure', halt the system with the "halt"
-command (wait for "halted" to be displayed) and reboot.  Then again
-boot OpenBSD this time with the command:
-
-
-	loadbsd bsd
-
-You need to do your final tweeks now.  First mount your file systems
-like so:
-
-	mount -av
-
-Your system is now complete but not completely configured; you
-should adjust the /etc/sendmail.cf file as necessary to suit your
-site and/or disable sendmail and other network related programs.
-These things can be found in /etc/netstart.  Use vi, if you installed
-the man pages you can type `man vi' or `man ed' for instructions
-on how to use these somewhat non-intuitive editors.
-
-You should also put a copy of the bsd kernel in your root partition.
-This can be done easily by mounting the AmigaDOS partition containing
-the kernel you used to start OpenBSD and copying the "bsd" file to
-the root:
-	mount -r -t ados /dev/sd0d /mnt
-	cp /mnt/bsd /
-(where /dev/sd0d is the AmigaDOS partition where you have bsd, and
-/mnt/bsd is the appropriate path of the bsd file).
-
-Once you are done with the rest of configuration unmount your file
-systems and halt your system, then reboot:
-
-	cd /
-	umount -av
-	halt
-	<reboot>
-
-Finally you can now boot your system and it will be completely
-functional:
-
-	loadbsd -a bsd
-
-When it boots off of the hard drive, you will have a complete
-OpenBSD system!  CONGRATULATIONS! (You really deserve them!!!)
+	To install from a NFS mounted directory:
+		When installing from a NFS-mounted directory, you must
+		have completed network configuration above, and also
+		set up the exported file system on the NFS server in
+		advance.
+
+		First you must identify the IP address of the NFS server
+		to load the distribution from, and the file system the
+		server expects you to mount.
+
+		The install program will also ask whether or not TCP
+		should be used for transport (the default is UDP).  Note
+		that TCP only works with newer NFS servers.
+
+		You will also have to provide the relative path to the
+		directory on the file system where the distribution sets
+		are located.  Note that this path should not be prefixed
+		with a '/'.
+
+		For instructions on how to complete the installation from
+		the CD-ROM distribution, see the section named "Common
+		file system installations" below.
+
+	To install from a local disk partition:
+		When installing from a local disk partition, you will
+		first have to identify which disk holds the distribution
+		sets.  This is normally "sdN" or "wdN" where N is a
+		number 0 through 9.  Next you will have to identify the
+		partition within that disk that holds the distribution,
+		this is a single letter between 'a' and 'p'.
+
+		You will also have to identify the type of file system
+		residing in the partition identified.  Currently you can
+		install from partitions that has been formatted as
+		Berkely fast file system (ffs) or AmigaDOS FFS (ados).
+
+		You will also have to provide the relative path to the
+		directory on the file system where the distribution sets
+		are located.  Note that this path should not be prefixed
+		with a '/'.
+
+		For instructions on how to complete the installation from
+		the a local disk partition, see the next section.
+		
+	Common file system installations:
+		The following instructions are common to installations
+		from local disk partitions, NFS mounted directories and
+		CD-ROMs.
+
+		A list of available distribution sets will be listed.  If
+		any sets has already been extracted, those will be marked
+		with an X.  Enter the name of one distribution set at a
+		time, until all desired distribution sets has been
+		installed on your system.
+
+	Common URL installations:
+		Once you have entered the required information, the
+		install program will fetch a file list and present
+		a list of all the distribution sets that were found
+		in the specified directory.  (If no valid sets were found,
+		you will be notified and given the option of unpacking
+		any gzipped tar files found or getting a file list if
+		none were found.)
+
+		At this point you may individually select distribution
+		sets to install or enter "all" to install all of
+		the sets (which is what most users will want to do).
+		You may also enter "list" to get a file list or
+		"done" when you are done selecting distribution sets.
+		(It is also possible to enter an arbitrary filename
+		and have it treated as a file set).
+
+		Once you have selected the file sets you want to install
+		and entered "done" you will be prompted to verify that
+		you really do want to download and install the files.
+		Assuming you acquiesce, the files will begin to download
+		and unpack.  If not, you will be given the option of
+		installing sets via one of the other install methods.
+
+
+	When all the selected distribution sets has been extracted, you
+	will be allowed to select which time zone your system will be
+	using, all the device nodes needed by the installed system will
+	be created for you and the file systems will be unmounted.  For
+	this to work properly, it is expected that you have installed
+	at least the "base21" and "etc21" distribution sets.
+
+
+Congratulations, you have successfully installed OpenBSD 2.1.  When you
+reboot into OpenBSD, you should log in as "root" at the login prompt.
+There is no initial password, but if you're using the machine in a
+networked environment, you should create yourself an account and
+protect it and the "root" account with good passwords.
+
+Some of the files in the OpenBSD 2.1 distribution might need to be
+tailored for your site.  In particular, the /etc/sendmail.cf file will
+almost definitely need to be adjusted, and other files in /etc will
+probably need to be modified, as well.  If you are unfamiliar with
+UN*X-like system administration, it's recommended that you buy a book
+that discusses it.
diff --git a/distrib/notes/amiga/prep b/distrib/notes/amiga/prep
index 957c737fa3a..bf0b9712eb9 100644
--- a/distrib/notes/amiga/prep
+++ b/distrib/notes/amiga/prep
@@ -19,11 +19,18 @@ Preparing you hard disk with HDToolBox:
 		Back up the partitions you are keeping.
 
 	What you need to do is partition your drives; creating at least
-	root, swap and /usr partitions and possibly at least one more for
-	/local if you have the space. (The root and swap partitions must
-	be on the same drive for your initial installation. You can use
-	other configurations after building a customized kernel once your
-	system is running.)
+	root, swap and /usr partitions and possibly some more for
+	/tmp, /var, /home or others of your own choice.  (The root and
+	swap partitions must be on the same drive for your initial
+	installation. You can use other configurations after building a
+	customized kernel once your system is running.)  Partitioning is
+	traditionally an area of great confusion and disagreement, and
+	religion plays a large role in most advice you'll get.  The
+	author of this paragraph is a fan of large and few partitions,
+	normally one per disk, unless it's the root disk, where I tend
+	to have /, swap, /tmp, /var & /usr.  I must admit that I step
+	aside from my normal rules of thumb very often due to the context
+	the machine will work in.
 
 	This should be done as the HDToolBox manual describes.  One thing
 	to note is that if you are not using a Commodore controller you
@@ -79,13 +86,27 @@ Preparing you hard disk with HDToolBox:
 	Once this is done OpenBSD/amiga will be able to recognize your
 	disks and which partitions it should use.
 
+Choosing installation root filesystem type:
+
+	The OpenBSD/amiga operating system can be installed using two
+	different root filesystems: ramdisk or miniroot.  The ramdisk
+	is strongly recommended as it requires less preparation work.
+	However the ramdisk kernel requires that your system has at
+	least 6MB of fastmem.  The miniroot requires less (installs on
+	a 4MB system should be possible) and has tools to make SLIP or
+	PPP connections, which the ramdisk doesn't, however you need
+	to be an experienced user to make use of these as the install
+	scripts doesn't deal with them.  Furthermore the miniroot
+	install requires you to do the preparation described in the
+	following paragraph.  To use the ramdisk install you should get
+	the bsd.rd kernel as well as the standard bsd one, and *do*
+	skip the next section!
+
 Transferring the miniroot filesystem:
 
-	The OpenBSD/amiga installation or upgrade uses a "miniroot"
+	The OpenBSD/amiga installation or upgrade can use a "miniroot"
 	fileystem which is installed on the partition used by OpenBSD
-	for swapping.  This allows more utilities to be present on the
-	filesystem than would be available when using an 880K floppy
-	disk.
+	for swapping.
 
 	Once the hard disk has been prepared for OpenBSD, the miniroot
 	filesystem (miniroot21.fs) is transferred to the swap partition
diff --git a/distrib/notes/amiga/upgrade b/distrib/notes/amiga/upgrade
index 17841e376d8..4cdf3f858f1 100644
--- a/distrib/notes/amiga/upgrade
+++ b/distrib/notes/amiga/upgrade
@@ -2,15 +2,15 @@ The upgrade to OpenBSD 2.1 is a binary upgrade; it would be prohibitive
 to make users upgrade by compiling and installing the 2.1 sources, and
 it would be very difficult to even compile a set of instructions that
 allowed them to do so.
-installing.
-
-To do the upgrade, you must have the OpenBSD kernel on AmigaDOS and
-you must transfer the upgrade filesystem upgr-21.fs onto the swap
-partition of the OpenBSD hard disk.  You must also have at least the
-"base21" 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,
+
+To do the upgrade, and if you are using the miniroot installation, you
+must have the OpenBSD kernel on AmigaDOS and you must transfer the root
+filesystem miniroot21.fs onto the swap partition of the OpenBSD hard disk.
+If you are using the ramdsik installation, the bsd.rd kernel is enough.
+You must also have at least the "base21" 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.
@@ -23,6 +23,11 @@ beginning the upgrade process.
 
 To upgrade your system, follow the following instructions:
 
+	If you know you need an -I option to loadbsd, you should add it
+	to the loadbsd invocation you'll use for the upgrade.
+
+	Miniroot installation:
+
 	Transfer the upgrade miniroot filesystem onto the hard disk
 	partition used by OpenBSD for swapping, as described in the
 	"Preparing your System for OpenBSD Installation" section above.
@@ -38,10 +43,29 @@ To upgrade your system, follow the following instructions:
 	swap partition.  When prompted for the root device, type
 	'sd0*' (replacing 0 with the disk number that OpenBSD used for
 	your root/swap device).  The '*' character indicates that the
-	root filesystem is contained on the swap partition.
+	root filesystem is contained on the swap partition.  Continue
+	reading below the ramdisk installation description:
+
+	Ramdisk installation:
+
+	Now boot up OpenBSD using the 2.1 kernel using the loadbsd
+	command:
+
+		loadbsd bsd.rd
+
+	You should see the screen clear and some information about
+	your system as the kernel configures the hardware.
+
+	Common instructions for both miniroot/ramdisk installations:
+
 	When you reach the prompt asking you for a shell name, just
 	hit return.
 
+	You will be asked which terminal type to use, you should just
+	hit return to select the default (vt220).
+
+	At the question whether to (I)nstall or (U)pgrade choose "U".
+
 	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
@@ -52,9 +76,11 @@ To upgrade your system, follow the following instructions:
 	However, if you hit it at an inopportune moment, your system
 	may be left in an inconsistent (and possibly unusable) state.
 
-	The upgrade program will then mount all of your file systems
-	under /mnt.  (In other words, your root partition will be
-	mounted on /mnt, your /usr partition on /mnt/usr, etc.)
+	The upgrade program will then chack & mount your root filesystem
+	under /mnt and grab some configuration info from it for the
+	continued upgrade process.  You'll be asked if the network
+	should be enabled at this point.  After that is done the rest
+	of the filesystems will be checked and mounted.
 
 	If you don't already have the OpenBSD distribution sets on your
 	disk, look in the installation section for information on how
@@ -67,54 +93,25 @@ To upgrade your system, follow the following instructions:
 	transfer them again now!)
 
 	After the software has been transferred to the machine (or
-	mounted, in the case of upgrading via NFS), change into the
-	directory containing the "base21" 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 base21" to upgrade the base
-	distribution.
-
-	Repeat the above two steps for all of the sets you wish to
-	upgrade.  (For each, change into the directory containing the
-	set, run "Set_tmp_dir" and accept the default path name, then
-	run the "Extract <setname>" command.)
-
-	If you were previously using the security distribution set,
-	you MUST upgrade to the new version, or you will not be able
-	to log in when the upgrade process is complete.  Similarly, if
-	you were not previously using the security set, you must NOT
-	upgrade to the new version.
-
-	When you are done upgrading all of the distribution sets you
-	wish to upgrade, issue the command "Cleanup".  It will clean
-	up the installation, by remaking some system databases.  When
-	it is complete, you should use "halt" to halt the system.
-
-	You will probably also want to copy the release "bsd" kernel
-	image to your root at some point.
-	
+	mounted, in the case of upgrading via NFS).
+
 Your system has now been upgraded to OpenBSD 2.1.
 
-	After a new kernel has been copied to your hard disk, your
-	machine is a complete OpenBSD 2.1 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.
+	After all this, your machine is a complete OpenBSD 2.1 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 etc20 distribution,
+	First, you will probably want to get the etc21.tar.gz 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
 	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, but if
-	not, you can just cd into /dev, and run the command "sh
-	MAKEDEV all".
+	Second, you might want to check your /dev against the new MAKEDEV
+	script found there, if you have changed the nodes locally.  The
+	upgrade process runs "sh MAKEDEV all" but that may not be enough
+	for your personal setup.
 
 	Third, you must deal with certain changes in the formats of
 	some of the configuration files.  The most notable change is
diff --git a/distrib/notes/amiga/xfer b/distrib/notes/amiga/xfer
index dc5821fbef9..ed494cf8dfb 100644
--- a/distrib/notes/amiga/xfer
+++ b/distrib/notes/amiga/xfer
@@ -1,19 +1,30 @@
 Installation is supported from several media types, including:
-	AmigaDOS HD partitions
+
+	AmigaDOS partitions
+	FFS partitions
 	Tape
-	NFS
+	Remote NFS partition
 	FTP
-	Net- or OpenBSD partitions, if such are available
-
-The miniroot filesystem needs to be transferred to the OpenBSD
-swap partition.  This can be done from AmigaDOS in the case of
-a new install or upgrade, or from OpenBSD when doing an
-upgrade.  See the "Preparing your System for OpenBSD
-Installation" section for details.
-
-The steps necessary to prepare the distribution sets
-for installation depend on which method of installation
-you choose.  The various methods are explained below.
+	HTTP
+
+The installation program is run under a minimal OpenBSD environment
+provided by one of two means: a ramdisk or a miniroot filesystem.
+We recommend using the ramdisk if your machine is big enough (at
+least 6MB of fastmem is required), otherwise a miniroot filesystem
+needs to be transferred to the OpenBSD swap partition.  This can be
+done from AmigaDOS in the case of a new install or upgrade, or from
+OpenBSD when doing an upgrade.  See the "Preparing your System for
+OpenBSD Installation" section for details.
+
+The steps necessary to prepare the distribution sets for
+installation depend on which method of installation you choose.
+The various methods are explained below.  However, for all methods
+you need to transfer a OpenBSD kernel binary to your AmigaDOS
+partition, optionally you must also get the miniroot image there
+for later transfer to your swap partition as explained elsewhere.
+For ramdisk installs you nedd to get both the bsd and bsd.rd
+kernel images, and for miniroot installs you need bsd and the
+miniroot21.fs image.
 
 To prepare for installing via an AmigaDOS partition:
 
@@ -45,7 +56,7 @@ To prepare for installing via a tape:
 	that describes the tape drive you're using (possibly
 	something like /dev/nrst0, but we make no guarantees 8-).
 	If you can't figure it out, ask your system administrator.
-	"<files>" are the names of the "set_name.nnn" files
+	"<files>" are the names of the "set_name.tar.gz" files
 	which you want to be placed on the tape.
 
 	Once you have done this, you can proceed to the next
@@ -67,14 +78,14 @@ To prepare for installing via NFS:
 	Once you have done this, you can proceed to the next
 	step in the installation process, preparing your hard disk.
 
-To prepare for installing via FTP:
+To prepare for installing via FTP/HTTP:
 
 	The preparations for this method of installation
 	are easy: all you have to do is make sure that
-	there's some FTP site from which you can retrieve
-	the OpenBSD installation when it's time to do
-	the install.  You should know the numeric IP
-	address of that site, the numeric IP address of
+	there's some FTP- or website from which you can
+	retrieve the OpenBSD installation when it's time to
+	do the install.  You should know the numeric IP
+	address of that site, and the numeric IP address of
 	your nearest router if one is necessary
 
 	Once you have done this, you can proceed to the next
@@ -88,7 +99,7 @@ following:
 	Place the distribution sets you wish to upgrade somewhere in
 	your current file system tree.  At a bare minimum, you must
 	upgrade the "base" binary distribution, and so must put the
-	"base11" set somewhere in your file system.  If you wish,
+	"base21.tar.gz" set somewhere in your file system.  If you wish,
 	you can do the other sets, as well, but you should NOT upgrade
 	the "etc" distribution; the "etc" distribution contains system
 	configuration files that you should review and update by hand.