- use the new m4.common shared instructions.

- try to have consistent order, across arches, in the list of possible
  installation media.
- alpha can't install over nfs, but macppc can.

1 files changed, 10 insertions, 68 deletions

diff --git a/distrib/notes/amiga/xfer b/distrib/notes/amiga/xfer
index 3311f7a2ac9..bd53c10d7a3 100644
--- a/distrib/notes/amiga/xfer
+++ b/distrib/notes/amiga/xfer
@@ -1,18 +1,17 @@
 Installation is supported from several media types, including:
 
-	AmigaDOS Fast file system partitions
+	CD-ROM
 	FFS partitions
+	AmigaDOS Fast file system partitions
 	Tape
 	Remote NFS partition
 	FTP
 	HTTP
 
-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.
+However, whichever method you choose, 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 earlier.
 For ramdisk installs you need to get both the bsd and bsd.rd
 kernel images, and for miniroot installs you need bsd and the
 miniroot{:--:}OSrev.fs image.
@@ -36,69 +35,12 @@ To prepare for installing via an AmigaDOS partition:
 	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 a tape:
-
-	To install OpenBSD from a tape, you need to somehow
-	get the OpenBSD filesets you wish to install on
-	your system on to the appropriate kind of tape,
-	in tar format.
-
-	If you're making the tape on a UN*X system, the easiest
-	way to do so is:
-
-		tar cvf <tape_device> <files>
-
-	where "<tape_device>" is the name of the tape device
-	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{:--:}OSrev.tgz" files
-	which you want to be placed on the tape.
-
-	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 NFS:
+OpenBSDXferShortPrelude
 
-	Place the OpenBSD software you wish to install into
-	a directory on an NFS server, and make that directory
-	mountable by the machine which you will be installing
-	OpenBSD on.  This will probably require modifying the
-	/etc/exports file of the NFS server and resetting
-	mountd, acts which will require superuser privileges.
-	Note the numeric IP address of the NFS server and of
-	the router closest to the new OpenBSD machine,
-	if the NFS server is not on a network which is
-	directly attached to the OpenBSD machine.
-
-	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/HTTP:
-
-	The preparations for this method of installation
-	are easy: all you have to do is make sure that
-	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
-	step in the installation process, preparing your hard disk.
 
-If you are upgrading OpenBSD, you also have the option of installing
-OpenBSD by putting the new distribution sets somewhere in your existing
-file system, and using them from there.  To do that, you must do the
-following:
+OpenBSDXferBareTape(xbase xfont xserv xshare)
 
-	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
-	"base{:--:}OSrev.tgz" 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.
+OpenBSDXferNFS
 
-	Once you have done this, you can proceed to the next step in
-	the upgrade process, actually upgrading your system.
+OpenBSDXferFFS