- 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.

10 files changed, 74 insertions, 1089 deletions

diff --git a/distrib/notes/alpha/xfer b/distrib/notes/alpha/xfer
index 5ab882a5979..85f149113a2 100644
--- a/distrib/notes/alpha/xfer
+++ b/distrib/notes/alpha/xfer
@@ -1,9 +1,9 @@
 Installation is supported from several media types, including:
 
+	CD-ROM
 	FFS partitions
 	Tape
-	Remote NFS partition
-	CD-ROM
+dnl	Remote NFS partition
 	FTP
 	HTTP
 
@@ -11,67 +11,9 @@ If you have the OpenBSD CD-ROM distribution (and a CD-ROM drive)
 you can boot from it.  Otherwise, you will need to create a bootable
 floppy disk.
 
+OpenBSDXferFloppyFromDOS
 
-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 distribution from the CD-ROM under 
-	DOS, you will find the bootable disks in the OSREV/MACHINE 
-	directory. Otherwise, you will have to download them from one of 
-	the OpenBSD ftp or http mirror sites, using an ftp client or a web 
-	browser. 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.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 the cksum(1) or md5(1) 
-	commands 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 correct block device, 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.
-
+OpenBSDXferFloppyFromUNIX
 
 If you neither have a floppy drive nor a CD-ROM drive on your alpha:
 
@@ -100,92 +42,12 @@ If you neither have a floppy drive nor a CD-ROM drive on your alpha:
 	actual install process.
 
 
-The steps necessary to prepare the distribution sets for installation
-depend on which method of installation you choose.  Some methods
-require a bit of setup first that is explained 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" and "etc{:--:}OSrev" 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
-
-	(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 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 of 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.
+OpenBSDXferShortPrelude
 
-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:
 
-	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" 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.
+OpenBSDXferBareTape(xbase xfont xserv xshare)
 
-	Once you have done this, you can proceed to the next step
-	in the upgrade process, actually upgrading your system.
+dnl OpenBSDXferNFS
+dnl
+OpenBSDXferFFS
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
diff --git a/distrib/notes/hp300/xfer b/distrib/notes/hp300/xfer
index c4e9a2cbcfe..ee3e7272bd8 100644
--- a/distrib/notes/hp300/xfer
+++ b/distrib/notes/hp300/xfer
@@ -1,93 +1,17 @@
 Installation is supported from several media types, including:
 
-	Local FFS partitions
+	CD-ROM
+	FFS partitions
 	Tape
 	Remote NFS partition
-	CD-ROM
 	FTP
 	HTTP
 
-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"
-	and "etc{:--:}OSrev" 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 hp300
-		tar cf <tape_device> base{:--:}OSrev.tgz etc{:--:}OSrev.tgz
-
-	(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
-	of 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.
+OpenBSDXferShortPrelude
 
-	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
-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" 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
diff --git a/distrib/notes/i386/xfer b/distrib/notes/i386/xfer
index b3649168bbf..a947c75befc 100644
--- a/distrib/notes/i386/xfer
+++ b/distrib/notes/i386/xfer
@@ -1,132 +1,27 @@
 Installation is supported from several media types, including:
 
-	DOS partitions
+	CD-ROM
 	FFS partitions
+	DOS (FAT) partitions
 	EXT2 partitions
 	Tape
+dnl	Remote NFS partition
 	FTP
 	HTTP
 
 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).
 
-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 from the internet.
+OpenBSDXferFloppyFromDOS
 
+OpenBSDXferFloppyFromUNIX
 
-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 distribution from the CD-ROM under 
-	DOS, you will find the bootable disks in the OSREV/MACHINE 
-	directory. Otherwise, you will have to download them from one of 
-	the OpenBSD ftp or http mirror sites, using an ftp client or a web 
-	browser. 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.
+OpenBSDXferShortPrelude
 
-	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>:"
+OpenBSDXferBareTape(xbase xfont xlink xserv xshare)
 
-	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 the cksum(1) or md5(1) 
-	commands 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 correct block device, 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 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:
-
-	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" 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.
-
-	Once you have done this, you can proceed to the next step in
-	the upgrade process, actually upgrading your system.
+dnl OpenBSDXferNFS
+dnl
+OpenBSDXferFFS
diff --git a/distrib/notes/macppc/xfer b/distrib/notes/macppc/xfer
index fbdcb6e6374..9df9b4bb487 100644
--- a/distrib/notes/macppc/xfer
+++ b/distrib/notes/macppc/xfer
@@ -2,71 +2,22 @@ Installation is supported from several media types, including:
 
 	CDROM
 	FFS partitions
-	HFS partitions (bootloader only, in conjuction with FTP/HTTP/tape)
+	HFS partitions (bootloader only, in conjuction with another media)
 	Tape
+	Remote NFS partition
 	FTP
 	HTTP
 
-Unless the machine already has openbsd installed on it, and
-the bootloader can be loaded from local disk the bootloader will
-need to be loaded from the network (netboot) but from there
-the system can be installed from any of the above.
-
-While an installation floppy is included in the snapshot it is unlikely
-that it will be very useful due to lack of floppy drive on the imac
-and the reported inability to boot from USB floppies on the supported
-version of the hardware.
-
-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:
+OpenBSDXferShortPrelude
 
-		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"
-	and "etc{:--:}OSrev" 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
-
-	(Note that you still need to fill in "<tape_device>" in the
-	example.)
+Unless the machine already has openbsd installed on it, and
+the bootloader can be loaded from local disk, the bootloader will
+need to be loaded from the network (netboot), but from then
+the system can be installed from any of the above sources.
 
-	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.
 
-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" 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
diff --git a/distrib/notes/mvme68k/xfer b/distrib/notes/mvme68k/xfer
index 61d4d863f22..9aa2cded643 100644
--- a/distrib/notes/mvme68k/xfer
+++ b/distrib/notes/mvme68k/xfer
@@ -1,118 +1,17 @@
 Installation is supported from several media types, including:
 
+	CD-ROM
 	FFS partitions
 	Tape
 	Remote NFS partitions
-	CD-ROM
 	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.
-
-The variety of options listed may seem confusing, but situations vary
-widely in terms of what peripherals and what sort of network arrangements
-a user has, the intent is to provide some way that will be practical.
-
-
-The steps necessary to prepare the distribution sets for installation
-depend on which method of installation you choose.  Some methods
-require a bit of setup first that is explained 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, 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
-	if test $# -lt 1
-	then
-		dd if=stboot of=${tape} obs=512
-		dd if=bootst of=${tape} obs=512
-		dd if=bsd.rd of=${tape} obs=8k conv=sync
-	fi
-	for file in base etc comp game man misc xbase xfont 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
-
-	
-	Note that this script creates a bootable tape. If you only want to
-	fetch the OpenBSD files from tape, but want to boot from another
-	device, you can save time and space creating the tape this way:
-
-	cd .../OSREV/MACHINE
-	sh -x /tmp/maketape noboot
-
-	
-	If you're using a system other than OpenBSD or SunOS, the tape
-	name and other requirements may change.
-
-
-To install 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
-	of 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.
+OpenBSDXferPrelude
 
-	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
-file system, and using them from there.  To do that, you must do the
-following:
+OpenBSDXferBootTape(xbase xfont xshare,stboot obs=512,bootst obs=512,bsd.rd obs=8k conv=sync)
 
-	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" 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
diff --git a/distrib/notes/sparc/xfer b/distrib/notes/sparc/xfer
index 381f6036b03..9b4dd432d39 100644
--- a/distrib/notes/sparc/xfer
+++ b/distrib/notes/sparc/xfer
@@ -1,9 +1,9 @@
 Installation is supported from several media types, including:
 
+	CD-ROM
 	FFS partitions
 	Tape
 	Remote NFS partition
-	CD-ROM
 	FTP
 	HTTP
 
@@ -29,72 +29,10 @@ from one of the FTP mirrors over the internet, you may wish to transfer
 the sets to a local FTP or NFS server, or copy them to a partition on
 the target system's disk or onto a SCSI tape.
 
-The variety of options listed may seem confusing, but situations vary
-widely in terms of what peripherals and what sort of network arrangements
-a user has, the intent is to provide some way that will be practical.
-
-
-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 distribution from the CD-ROM under 
-	DOS, you will find the bootable disks in the OSREV/MACHINE 
-	directory. Otherwise, you will have to download them from one of 
-	the OpenBSD ftp or http mirror sites, using an ftp client or a web 
-	browser. 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.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 the cksum(1) or md5(1) 
-	commands 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 correct block device, 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.
 
+OpenBSDXferFloppyFromDOS
 
+OpenBSDXferFloppyFromUNIX
 
 Creating a bootable hard disk using SunOS or other Un*x-like system:
 
@@ -175,7 +113,6 @@ Creating a bootable hard disk using SunOS or other Un*x-like system:
 	and the filesystem information don't agree about the partition
 	size and geometry, however the results will be usable.
 
-
 Creating a network bootable setup using SunOS or other Un*x-like system:
 
 	The details of setting up a network bootable environment vary
@@ -192,111 +129,11 @@ Creating a network bootable setup using SunOS or other Un*x-like system:
 
 
 
-The steps necessary to prepare the distribution sets for installation
-depend on which method of installation you choose.  Some methods
-require a bit of setup first that is explained below.
-
-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 from the internet.
-
-
-To install or upgrade OpenBSD using a tape, you need to do the following:
+OpenBSDXferPrelude
 
-	To install OpenBSD from a tape, 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".
+OpenBSDXferBootTape(xbase xfont xserv xshare,bsd.rd obs=8k conv=sync,boot obs=8k conv=sync)
 
-	#! /bin/sh
-	tape=/dev/nrst0
-	mt -f ${tape} rewind
-	if test $# -lt 1
-	then
-		for file in bsd.rd boot
-		do
-			dd if=${file} of=${tape} obs=8k conv=sync
-		done
-	fi
-	for file in base etc comp game man misc xbase xfont 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
+OpenBSDXferNFS
 
-
-	And then:
-
-	cd .../OSREV/sparc
-	sh -x /tmp/maketape
-
-	
-	Note that this script creates a bootable tape. If you only want to
-	fetch the OpenBSD files from tape, but want to boot from another
-	device, you can save time and space creating the tape this way:
-
-	cd .../OSREV/sparc
-	sh -x /tmp/maketape noboot
-
-	
-	If you're using a system other than OpenBSD or SunOS, the tape
-	name and other requirements may change.
-
-
-To install 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
-	of 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
-file system, and using them from there.  To do that, you must do the
-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
-	"base{:--:}OSrev" 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.
-
-	Once you have done this, you can proceed to the next step in
-	the upgrade process, actually upgrading your system.
+OpenBSDXferFFS
diff --git a/distrib/notes/sparc64/xfer b/distrib/notes/sparc64/xfer
index 2acb680a5a1..b0e72679f04 100644
--- a/distrib/notes/sparc64/xfer
+++ b/distrib/notes/sparc64/xfer
@@ -1,9 +1,9 @@
 Installation is supported from several media types, including:
 
+	CD-ROM
 	FFS partitions
 	Tape
 	Remote NFS partition
-	CD-ROM
 	FTP
 	HTTP
 
@@ -26,74 +26,11 @@ dnl from one of the FTP mirrors over the internet, you may wish to transfer
 dnl the sets to a local FTP or NFS server, or copy them to a partition on
 dnl the target system's disk.
 
-The variety of options listed may seem confusing, but situations vary
-widely in terms of what peripherals and what sort of network arrangements
-a user has, the intent is to provide some way that will be practical.
-
-dnl
 dnl XXX uncomment when floppy available
-dnl Creating a bootable floppy disk using DOS/Windows:
-dnl
-dnl	First you need to get access to the OpenBSD bootable floppy
-dnl	images. If you can access the distribution from the CD-ROM under 
-dnl	DOS, you will find the bootable disks in the OSREV/MACHINE 
-dnl	directory. Otherwise, you will have to download them from one of 
-dnl	the OpenBSD ftp or http mirror sites, using an ftp client or a web 
-dnl	browser. In either case, take care to do "binary" transfers, since 
-dnl	these are images files and any DOS cr/lf translations or control/z 
-dnl	EOF interpretations will result in corrupted transfers.
-dnl	
-dnl	You will also need to go to the "tools" directory and grab a
-dnl	copy of the rawrite.exe utility and its documentation.  This
-dnl	program is needed to correctly copy the bootable filesystem
-dnl	image to the floppy, since it's an image of a unix partition
-dnl	containing a ffs filesystem, not a MSDOS format diskette.
-dnl
-dnl	Once you have installed rawrite.exe, just run it and specify the
-dnl	name of the bootable image, such as "floppy.fs" and the name of
-dnl	the floppy drive, such as "a:".  Be sure to use good quality HD
-dnl	(1.44MB) floppies, formatted on the system you're using.  The
-dnl	image copy and boot process is not especially tolerant of read
-dnl	errors. 
-dnl
-dnl	Note that if you are using NT to write the images to disk, you
-dnl	will need to use ntrw.exe instead.  It is also available in the
-dnl	"tools" directory.  Grab it and run in with the correct 
-dnl	arguments like this "ntrw <image> <drive>:"
-dnl
-dnl	Note that, when installing, the boot floppy can be write-protected
-dnl	(i.e.  read-only).
-dnl
+dnl OpenBSDXferFloppyFromDOS
 dnl
-dnl Creating a bootable floppy disk using SunOS or other Un*x-like system:
+dnl OpenBSDXferFloppyFromUnix
 dnl
-dnl	First, you will need obtain a local copy of the bootable filesystem
-dnl	image as described above.  If possible use the cksum(1) or md5(1) 
-dnl	commands to verify the checksums of the images vs. the values in 
-dnl	the CKSUM or MD5 files on the mirror site.
-dnl
-dnl	Next, use the dd(1) utility to copy the file to the floppy drive.
-dnl	Under SunOS, the command would be:
-dnl
-dnl		dd if=floppy{:--:}OSrev.fs of=/dev/rfd0c bs=36b
-dnl
-dnl	If you are using something other than SunOS, you may have to adapt
-dnl	this to conform to local naming conventions for the floppy and
-dnl	options suitable for copying to a "raw" floppy image.  The key
-dnl	issue is that the device name used for the floppy *must* be one
-dnl	that refers to the correct block device, not a partition or
-dnl	compatibility mode, and the copy command needs to be compatible
-dnl	with the requirement that writes to a raw device must be in
-dnl	multiples of 512-byte blocks.  The variations are endless and
-dnl	beyond the scope of this document.
-dnl
-dnl	If you're doing this on the system you intend to boot the floppy on,
-dnl	copying the floppy back to a file and doing a compare or checksum
-dnl	is a good way to verify that the floppy is readable and free of
-dnl	read/write errors.
-dnl
-dnl
-
 dnl XXX uncomment when floppy or miniroot available
 dnl XXX make sure to adapt text, especially examples, if only floppy
 dnl XXX or miniroot is available, but not both.
@@ -176,7 +113,6 @@ dnl 	In either case, you've created a situation where the disklabel
 dnl 	and the filesystem information don't agree about the partition
 dnl 	size and geometry, however the results will be usable.
 dnl 
-
 Creating a network bootable setup using SunOS or other Un*x-like system:
 
 	The details of setting up a network bootable environment vary
@@ -192,10 +128,7 @@ Creating a network bootable setup using SunOS or other Un*x-like system:
 	by the netboot setup.
 
 
-
-The steps necessary to prepare the distribution sets for installation
-depend on which method of installation you choose.  Some methods
-require a bit of setup first that is explained below.
+OpenBSDXferPrelude
 
 dnl XXX uncomment when floppy available
 dnl The floppy installation allows installing OpenBSD directly from FTP
@@ -206,84 +139,8 @@ dnl distribution sets to a local server or disk and perform the installation
 dnl from there, rather than directly from the internet.
 dnl 
 
-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, 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
-	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/sparc
-	sh -x /tmp/maketape
-
-	
-	If you're using a system other than OpenBSD or SunOS, the tape
-	name and other requirements may change.
-
-
-To install 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
-	of 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
-file system, and using them from there.  To do that, you must do the
-following:
+OpenBSDXferBareTape
 
-	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" 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
diff --git a/distrib/notes/sun3/xfer b/distrib/notes/sun3/xfer
index 41517d9254e..cdf778df381 100644
--- a/distrib/notes/sun3/xfer
+++ b/distrib/notes/sun3/xfer
@@ -1,9 +1,9 @@
 Installation is supported from several media types, including:
 
+	CD-ROM (with PROM versions >= 3.0)
 	FFS partitions
 	Tape
 	Remote NFS partition
-	CD-ROM (with PROM versions >= 3.0)
 	FTP
 	HTTP
 
@@ -16,10 +16,6 @@ FTP mirrors over the internet, you may wish to transfer the sets to a
 local FTP or NFS server, or copy them to a partition on the target
 system's disk or onto a SCSI tape.
 
-The variety of options listed may seem confusing, but situations vary
-widely in terms of what peripherals and what sort of network arrangements
-a user has, the intent is to provide some way that will be practical.
-
 
 Creating a bootable hard disk using SunOS or other Un*x-like system:
 
@@ -63,111 +59,11 @@ Creating a network bootable setup using SunOS or other Un*x-like system:
 	by the netboot setup.
 
 
+OpenBSDXferPrelude
 
-The steps necessary to prepare the distribution sets for installation
-depend on which method of installation you choose.  Some methods
-require a bit of setup first that is explained below.
-
-The 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 from the internet.
-
-
-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, each in "tar" format or
-	in "gzipped tar format".  First you will need to transfer the
-	distribution sets to your local system, using ftp.  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".
+OpenBSDXferBootTape(,tapeboot obs=8k conv=sync,bsd.rd obs=8k conv=sync)
 
-	#! /bin/sh
-	tape=/dev/nrst0
-	mt -f ${tape} rewind
-	if test $# -lt 1
-	then
-		for file in tapeboot bsd.rd
-		do
-			dd if=${file} of=${tape} obs=8k conv=sync
-		done
-	fi
-	for file in base etc comp game man misc
-	do
-		dd if=${file}OSrev.tgz of=${tape} obs=8k conv=sync
-	done
-	tar cf ${tape} bsd
-	mt -f ${tape} offline
-	# end of script
+OpenBSDXferNFS
 
-
-	And then:
-
-	cd .../OSREV/MACHINE
-	sh -x /tmp/maketape
-
-	
-	Note that this script creates a bootable tape. If you only want to
-	fetch the OpenBSD files from tape, but want to boot from another
-	device, you can save time and space creating the tape this way:
-
-	cd .../OSREV/MACHINE
-	sh -x /tmp/maketape noboot
-
-	
-	If you're using a system other than OpenBSD or SunOS, the tape
-	name and other requirements may change.
-
-
-To install 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
-	of 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
-file system, and using them from there.  To do that, you must do the
-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
-	"base{:--:}OSrev" 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.
-
-	Once you have done this, you can proceed to the next step in
-	the upgrade process, actually upgrading your system.
+OpenBSDXferFFS
diff --git a/distrib/notes/vax/xfer b/distrib/notes/vax/xfer
index 343165f76cc..2c771780fab 100644
--- a/distrib/notes/vax/xfer
+++ b/distrib/notes/vax/xfer
@@ -1,95 +1,17 @@
 Installation is supported from several media types, including:
 
+	CD-ROM
 	FFS partitions
 	Tape
 	Remote NFS partition
-	CD-ROM
 	FTP
 	HTTP
 
+OpenBSDXferPrelude
 
-The steps necessary to prepare the distribution sets for installation
-depend on which method of installation you choose.  Some methods
-require a bit of setup first that is explained 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, 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 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/sparc
-	sh -x /tmp/maketape
-
-	If you're using a system other than OpenBSD or SunOS, the tape
-	name and other requirements may change.
-
-
-To install 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
-	of 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
-file system, and using them from there.  To do that, you must do the
-following:
+OpenBSDXferBareTape
 
-	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" 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