Factorize more common texts from the ramdisk operation.

No text changes except for harmonization, and the blurb about network
interface flags has bene slightly changed for some arches.

11 files changed, 205 insertions, 714 deletions

diff --git a/distrib/notes/alpha/install b/distrib/notes/alpha/install
index 5e30fae53d7..ad282eb6871 100644
--- a/distrib/notes/alpha/install
+++ b/distrib/notes/alpha/install
@@ -1,3 +1,4 @@
+dnl	$OpenBSD: install,v 1.18 2002/03/30 22:52:57 miod Exp $
 OpenBSDInstallPrelude
 
 dnl XXX document mopbooting from the SRM console.
@@ -61,93 +62,22 @@ OpenBSDBootMsgs
 	installing from a non-serial console, the default of "sun"
 	is correct.  If you are installing from a serial console
 	you should choose the terminal type from amongst those listed.
-	(If your terminal type is xterm, just use vt100).  After
-	entering the terminal type you will be asked whether you
-	wish to do an "install" or an "upgrade".  Enter 'i' for a
-	fresh install or 'u' to upgrade an existing installation.
-
-	You will be presented with a welcome message and asked if
-	you really wish to install (or upgrade).  Assuming you
-	answered yes, 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 "wd0" for IDE drives.  Reply with the name
-	of your disk.
-
-	Next the disk label which defines the layout of the OpenBSD
-	file systems must be set up.  The installation script will
-	invoke an interactive editor allowing you to do this.  Note
-	that partition 'c' inside this disk label should ALWAYS
-	reflect the entire disk, including any non-OpenBSD portions.
-	If you are labeling a new disk, you will probably start
-	out with an 'a' partition that spans the disk.  In this
-	case You should delete 'a' before adding new partitions.
-	The root file system should be in partition 'a', and swap
-	is usually in partition 'b'.  It is recommended that you
-	create separate partitions for /usr and /var, and if you
-	have room for it, one for /home.  For help in the disk
-	label editor, enter '?' or 'M' to view the manual page (see
-	the info on the ``-E'' flag).
-
-	The swap partition (usually 'b') should have a type of "swap", all
-	other native OpenBSD partitions should have a type of "4.2BSD".
-	Block and fragment sizes are usually 8192 and 1024 bytes, but can
-	also be 16384 and 2048 bytes.
-
-	The install program will now label your disk and ask which file
-	systems should be created on which partitions.  It will auto-
-	matically 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 (e.g.
-	"sd0") with the letter identifying the partition (e.g. "d")
-	appended (e.g. "sd0d").  Then it will ask where this partition is
-	to be mounted, e.g. /usr.  This process will be repeated until
-	you enter "done".
-
-	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.
-
-	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 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
+	(If your terminal type is xterm, just use vt100).
+OpenBSDInstallPart3({:- or "wd0" for IDE drives-:})
+
+OpenBSDInstallPart4
+
+OpenBSDInstallPart5(sd0)
+
+OpenBSDInstallNet(linkflags)dnl
+ 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 have been completed, you will be
-	able to extract the distribution sets onto your system.  There
-	are several install methods supported; FTP, HTTP, tape, CD-ROM,
-	or a local disk partition.  Note that installation from floppies
-	is not currently supported.
+OpenBSDInstallNet2({:-CD-ROM, -:},nofloppy)
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/amiga/install b/distrib/notes/amiga/install
index ddb8908378e..5c4fd491059 100644
--- a/distrib/notes/amiga/install
+++ b/distrib/notes/amiga/install
@@ -1,3 +1,4 @@
+dnl	$OpenBSD: install,v 1.22 2002/03/30 22:52:57 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSDInstallPart2
@@ -83,44 +84,15 @@ OpenBSDBootMsgs
 	does not write disklabels currently.  You should expect
 	this error whenever using newfs.
 
-	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
+OpenBSDInstallNet(linkflags)dnl
+ 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 have 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 have been completed, you will be
-	able to extract the distribution sets onto your system.  There
-	are several install methods supported; FTP, HTTP, tape, CD-ROM, NFS
-	or a local disk partition.  Note that installation from floppies
-	is not currently supported.
+OpenBSDInstallNet2({:-CD-ROM, NFS, -:},nofloppy)
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/hp300/install b/distrib/notes/hp300/install
index 4f8c2a12a58..79d31e648cd 100644
--- a/distrib/notes/hp300/install
+++ b/distrib/notes/hp300/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.18 2002/03/18 22:40:04 miod Exp $
+dnl	$OpenBSD: install,v 1.19 2002/03/30 22:52:57 miod Exp $
 OpenBSDInstallPrelude
 dnl No extra line, this has to stick to the geometry notes paragraph.
 The file `HP-IB.geometry' has geometry information for several HP-IB
@@ -110,33 +110,13 @@ OpenBSDBootMsgs
 	or vt100 compatible terminal; nothing else is supported.  (If
 	your terminal type is xterm, just use vt100).
 	
-	After entering the terminal type you will be asked whether you
-	wish to do an "(I)nstall" or an "(U)pgrade".  Enter 'I' for a
-	fresh install or 'U' to upgrade an existing installation.
-
-	You will be presented with a welcome message and asked if
-	you really wish to install (or upgrade).  Assuming you
-	answered yes, 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 "hd0" for
-	HPIB/CS80 drives or "sd0" for SCSI drives.  Reply with the
-	name of your disk.
+OpenBDSInstallPart3({:- or "hd0" for HPIB/CS80 drives-:})
 
 	Please note that, if you choose to have your root (/) filesystem
 	on a SCSI drive, that only device ID 4, 5 and 6 (that is, sd4,
 	sd5 and sd6 from OpenBSD's point of view) are bootable.
 
-	Next the disk label which defines the layout of the OpenBSD
-	file systems must be set up.  The installation script will
-	invoke an interactive editor allowing you to do this.  Note
-	that partition 'c' inside this disk label should ALWAYS
-	reflect the entire disk, including any non-OpenBSD portions.
-	The root file system should be in partition 'a', and swap
-	is usually in partition 'b'.  It is recommended that you
-	create separate partitions for /usr and /var, and if you
-	have room for it, one for /home.  For help in the disk
-	label editor, enter '?' or 'M' to view the manual page (see
-	the info on the ``-E'' flag).
+OpenBSDInstallPart4
 
 	Since the target disk will become the boot disk for your new
 	OpenBSD/MACHINE installation, the disklabel program will restrict
@@ -145,57 +125,11 @@ OpenBSDBootMsgs
 	plan to install a bootblock on this disk, you can reclaim this
 	space with the 'b' command.
 
-	The swap partition (usually 'b') should have a type of "swap", all
-	other native OpenBSD partitions should have a type of "4.2BSD".
-	Block and fragment sizes are usually 8192 and 1024 bytes, but can
-	also be 4096 and 512 or even 16384 and 2048 bytes.
-
-	The install program will now label your disk and 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 (e.g. "hd0")
-	with the letter identifying the partition (e.g. "d") appended (e.g.
-	"hd0d").  Then it will ask where this partition is to be mounted,
-	e.g. /usr.  This process will be repeated until you enter "done".
-
-	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.
-
-	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.  No
-	interface-specific flags should be required.
-
-	After all network interfaces have been configured the install
-	program 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 have been completed, you will be
-	able to extract the distribution sets onto your system.  There
-	are several install methods supported; FTP, HTTP, tape, CD-ROM, NFS
-	or a local disk partition.
+OpenBSDDInstallPart5(sd0)
+
+OpenBSDInstallNet
+
+OpenBSDInstallNet2({:-CD-ROM, NFS, -:})
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/i386/install b/distrib/notes/i386/install
index bf6beb819c8..728309c1d3b 100644
--- a/distrib/notes/i386/install
+++ b/distrib/notes/i386/install
@@ -1,3 +1,4 @@
+dnl	$OpenBSD: install,v 1.33 2002/03/30 22:52:57 miod Exp $
 OpenBSDInstallPrelude
 
 If OpenBSD will be sharing the disk with DOS or another operating
@@ -39,18 +40,7 @@ OpenBSDBootMsgs
 	You will next be asked for your terminal type.  You should just
 	hit return to select the default (vt220).
 
-	Now you will be asked whether you wish to do an "install"
-	or an "upgrade".  Enter 'i' for a fresh install or 'u' to
-	upgrade an existing installation.
-
-	You will be presented with a welcome message and asked if
-	you really wish to install (or upgrade).
-
-	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 "wd0" for IDE/RLL/ESDI/ST506
-	drives or "sd0" for SCSI drives.  Reply with the name of your
-	disk.
+OpenBSDInstallPart3({:- or "wd0" for IDE/RLL/ESDI/ST506 drives-:})
 
 	Next you will have to edit or create a disk label for the disk
 	OpenBSD is being installed on.  If there are any existing
@@ -66,30 +56,9 @@ OpenBSDBootMsgs
 	correct this.  Note that you should make OpenBSD be the active
 	partition at least until the install has been completed.
 
-	Next the disk label which defines the layout of the OpenBSD
-	file systems must be set up.  The installation script will
-	invoke an interactive editor allowing you to do this.  Note
-	that partition 'c' inside this disk label should ALWAYS
-	reflect the entire disk, including any non-OpenBSD portions.
-	If you are labeling a new disk, you will probably start
-	out with an 'a' partition that spans the disk.  In this case
-	You should delete 'a' before adding new partitions.
-	The root file system should be in partition 'a', and swap
-	is usually in partition 'b'.  If you have DOS or Linux
-	partitions defined on the disk, these will usually show up
-	as partition 'h', 'i' and so on.  It is recommended that
-	you create separate partitions for /usr, /tmp, and /var, and
-	if you have room for it, one for /home.  In doing this, remember
-	to skip 'c', leaving it as type "unused".  Create your next
-	partition as 'd' and continue from there with any additional
-	partitions.  If you have DOS or Linux partitions defined on the
-	disk, these will usually show up as partition 'h', 'i', and
-	so on.
-
-	When you are finished with disklabel you will be prompted for
-	the mount points for the partitions in the current label.
-	For help in the disk label editor, enter '?' or 'M' to view
-	the manual page (see the info on the ``-E'' flag).
+OpenBSDInstallPart4({:- If you have DOS or Linux partitions
+	defined on the disk, these will usually show up as partition
+	'h', 'i' and so on.-:})
 
 	Note that all OpenBSD partitions in the disk label must have an
 	offset that makes it start within the OpenBSD part of the disk,
@@ -98,65 +67,17 @@ OpenBSDBootMsgs
 	shared with other operating systems, and within the OpenBSD fdisk
 	partition if the disk is being shared.
 
-	The swap partition (usually 'b') should have a type of "swap", all
-	other native OpenBSD partitions should have a type of "4.2BSD".
-	Block and fragment sizes are usually 8192 and 1024 bytes, but can
-	also be 4096 and 512 or even 16384 and 2048 bytes.
-
-	The install program will now label your disk and ask which file
-	systems should be created on which partitions.  It will auto-
-	matically 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 (e.g.
-	"wd0") with the letter identifying the partition (e.g. "d")
-	appended (e.g. "wd0d").  Then it will ask where this partition is
-	to be mounted, e.g. /usr.  This process will be repeated until
-	you enter "done".
-
-	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.
-
-	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 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
+OpenBSDInstallPart5(wd0)
+
+OpenBSDInstallNet(linkflags)dnl
+ 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 have 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 have been completed, you will be
-	able to extract the distribution sets onto your system.  There
-	are several install methods supported; FTP, HTTP, tape, CD-ROM,
-	or a local disk partition.  Note that installation from floppies
-	is not currently supported.
+OpenBSDInstallNet2({:-CD-ROM, -:},nofloppy)
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index 1506fb5bcc8..9d9eb8ae29e 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.31 2002/03/30 19:33:17 miod Exp $
+dnl	$OpenBSD: m4.common,v 1.32 2002/03/30 22:52:55 miod Exp $
 dnl
 dnl simulate an include path with a macro 'includeit'.
 define(`includeit',`sinclude('INCLUDE/`$1)sinclude('INCLUDE/../`$1)')dnl
@@ -267,6 +267,108 @@ define({:-OpenBSDBootMsgs-:},
 	worry -- you can get at this information later inside the
 	install program.-:})dnl
 dnl
+dnl OpenBSDInstallPart3(alternate common disk type description)
+dnl Describes the beginning of the bsd.rd operation
+dnl
+define({:-OpenBSDInstallPart3-:},
+{:-	After entering the terminal type you will be asked whether you
+	wish to do an "(I)nstall" or an "(U)pgrade".  Enter 'I' for a
+	fresh install or 'U' to upgrade an existing installation.
+
+	You will be presented with a welcome message and asked if
+	you really wish to install (or upgrade).  Assuming you
+	answered yes, 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$2.
+	Reply with the name of your disk.-:})dnl
+dnl
+dnl OpenBSDInstallPart4(mention about other OS partitions)
+dnl Describes the disklabel operation
+dnl
+define({:-OpenBSDInstallPart4-:},
+{:-	Next the disk label which defines the layout of the OpenBSD
+	file systems must be set up.  The installation script will
+	invoke an interactive editor allowing you to do this.  Note
+	that partition 'c' inside this disk label should ALWAYS
+	reflect the entire disk, including any non-OpenBSD portions.
+	If you are labeling a new disk, you will probably start
+	out with an 'a' partition that spans the disk.  In this
+	case you should delete 'a' before adding new partitions.
+	The root file system should be in partition 'a', and swap
+	is usually in partition 'b'.$4
+
+	It is recommended that you create separate partitions for /usr,
+	/tmp and /var, and if you have room for it, one for /home.  In
+	doing this, remember to skip 'c', leaving it as type "unused".
+	For help in the disk label editor, enter '?' or 'M' to view the
+	manual page (see the info on the ``-E'' flag).-:})dnl
+dnl
+dnl OpenBSDInstallPart5
+dnl More disklabel notes(disk)
+define({:-OpenBSDInstallPart5-:},
+{:-	The swap partition (usually 'b') should have a type of "swap", all
+	other native OpenBSD partitions should have a type of "4.2BSD".
+	Block and fragment sizes are usually 8192 and 1024 bytes, but can
+	also be 4096 and 512 or even 16384 and 2048 bytes.
+
+	The install program will now label your disk and ask which file
+	systems should be created on which partitions.  It will auto-
+	matically 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 (e.g.
+	"$1") with the letter identifying the partition (e.g. "d")
+	appended (e.g. "$1d").  Then it will ask where this partition is
+	to be mounted, e.g. /usr.  This process will be repeated until
+	you enter "done".
+
+	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.-:})dnl
+dnl
+dnl OpenBSDInstallNet(has media settings information following)
+dnl Setting up the network, part 1
+define({:-OpenBSDInstallNet-:},
+{:-	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 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.ifelse(X$1,X,{:- Typically no media flags are required as
+	autodetect normally works.-:})-:})dnl
+dnl
+dnl OpenBSDInstallNet2(other installation sources,hasfloppy)
+dnl Setting up the network, part 2 (after the media flags)
+define({:-OpenBSDInstallNet2-:},
+{:-	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 have been completed, you will be
+        able to extract the distribution sets onto your system.  There
+        are several install methods supported; FTP, HTTP, tape,
+	$1or a local disk partition.
+	ifelse(X$2,X,,{:-Note that installation from floppies is not currently supported.-:})-:})dnl
+dnl
 dnl Notes for various installation methods.
 dnl
 define({:-OpenBSDFTPInstall-:},
diff --git a/distrib/notes/macppc/install b/distrib/notes/macppc/install
index fafa76f0d13..ea55877cd89 100644
--- a/distrib/notes/macppc/install
+++ b/distrib/notes/macppc/install
@@ -1,3 +1,4 @@
+dnl	$OpenBSD: install,v 1.9 2002/03/30 22:52:57 miod Exp $
 OpenBSDInstallShortPrelude
 
 Before you begin, you should decide if OpenBSD is to be installed
@@ -37,19 +38,7 @@ OpenBSDBootMsgs
 	You will next be asked for your terminal type.  You should just
 	hit return to select the default (vt220).
 
-	Now you will be asked whether you wish to do an "install"
-	or an "upgrade".  Enter 'i' for a fresh install or 'u' to
-	upgrade an existing installation.
-
-	You will be presented with a welcome message and asked if
-	you really wish to install (or upgrade).  Assuming you
-	answered yes, 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 "wd0" for IDE/ATA drives or
-	"sd0" for SCSI drives.  Reply with the name of your disk.
+OpenBSDInstallPart3({:- or "wd0" for IDE/ATA drives-:})
 
 	Next you will have to edit or create a disklabel for the disk
 	OpenBSD is being installed on.  If there are any existing
@@ -117,80 +106,25 @@ OpenBSDBootMsgs
 	correct this.  Note that you should make OpenBSD be the active
 	partition at least until the install has been completed.
 
-	Next the disk label which defines the layout of the OpenBSD file
-	systems must be set up.  The installation script will invoke an
-	editor allowing you to do this.  Note that partition 'c' inside
-	this disk label should ALWAYS reflect the entire disk, including
-	any non-OpenBSD portions.  The root file system should be in
-	partition 'a', and swap is usually in partition 'b'.  If you have
-	DOS or Linux partitions defined on the disk, these will usually
-	show up as partition 'h', 'i' and so on.  It is recommended that
-	you create separate partitions for /usr and /var, and if you have
-	room for it, also for /home.  Currently OpenBSD will not share a
-	disk with any other operating system care should be taken not to
-	overwrite any data on other disks in the system and that no data
-	is on the disk to be used for OpenBSD/MACHINE.
+OpenBSDInstallPart4({:-If you have DOS or Linux
+	partitions defined on the disk, these will usually show up as
+	partition 'h', 'i' and so on.
+
+	Currently OpenBSD will not share a disk with any other operating
+	system, so care should be taken not to overwrite any data on other
+	disks in the system and that no data is on the disk to be used
+	for OpenBSD/MACHINE.
 
 	Note that all OpenBSD partitions in the disk label must have an
 	offset that makes it start within the OpenBSD part of the disk,
 	and a size that keeps it inside of that portion of the disk.  This
-	is within the bounds of the 'c' partition.
-
-	The swap partition (usually 'b') should have a type of "swap", all
-	other native OpenBSD partitions should have a type of "4.2BSD".
-	Block and fragment sizes are usually 8192 and 1024 bytes, but can
-	also be 4096 and 512 or even 16384 and 2048 bytes.
-
-	The install program will now label your disk and ask which file
-	systems should be created on which partitions.  It will auto-
-	matically 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 (e.g.
-	"sd0") with the letter identifying the partition (e.g. "d")
-	appended (e.g. "sd0d").  Then it will ask where this partition is
-	to be mounted, e.g. /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.
-
-	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 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. Supply the appropriate media options
-	as suggested, Typically no media flags are required as autodetect
-	normally works.
-
-	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 have been completed, you will be
-	able to extract the distribution sets onto your system.  There
-	are several install methods supported; FTP, HTTP, tape, CD-ROM
-	or a local disk partition.
+	is within the bounds of the 'c' partition.-:})
+
+OpenBSDInstallPart5(sd0)
+
+OpenBSDInstallNet
+
+OpenBSDInstallNet2({:-CD-ROM, -:})
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install
index 194e9ca3d54..0a50dc13cfe 100644
--- a/distrib/notes/mvme68k/install
+++ b/distrib/notes/mvme68k/install
@@ -1,3 +1,4 @@
+dnl	$OpenBSD: install,v 1.14 2002/03/30 22:52:58 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -127,74 +128,15 @@ OpenBSDBootMsgs
 	the terminal type from amongst those listed.
 	(If your terminal type is xterm, just use vt100).
 
-	After entering the terminal type you will be greeted by a
-	welcome message and asked if you really want to continue.
-	Assuming you answered yes, 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".
-	Reply with the name of your disk.
-
-	Next you will have to edit or create a disklabel for the disk
-	OpenBSD is being installed on.  The installation script will
-	invoke the text editor allowing you to do this.  Note that
-	partition 'c' inside this disk label should ALWAYS reflect the
-	entire disk, including any non-OpenBSD portions.  The root file
-	system should be in partition 'a', and swap is usually in partition
-	'b'.  It is recommended that you create separate partitions for
-	root and /usr, you may also want to specify /var and /home
-	partitions.
-
-	The swap partition (usually 'b') should have a type of "swap", all
-	other native OpenBSD partitions should have a type of "4.2BSD".
-	Block and fragment sizes are usually 8192 and 1024 bytes, but can
-	also be 16384 and 2048 bytes.
-
-	The install program will now label your disk and ask which file
-	systems should be created on which partitions.  It will auto-
-	matically 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 (e.g.
-	"sd0") with the letter identifying the partition (e.g. "d")
-	appended (e.g. "sd0d").  Then it will ask where this partition is
-	to be mounted, e.g. /usr.  This process will be repeated until
-	you type "done".
-
-	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.
-
-	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 media flags to set.
-
-	After all network interfaces have 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 have been completed, you will be
-	able to extract the distribution sets onto your system.  There
-	are several install methods supported; FTP, HTTP, tape, CD-ROM, NFS
-	or a local disk partition.
+OpenBSDInstallPart3
+
+OpenBSDInstallPart4
+
+OpenBSDInstallPart5(sd0)
+
+OpenBSDInstallNet
+
+OpenBSDInstallNet2({:-CD-ROM, NFS, -:})
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index 571b0ae1521..82678529638 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -1,3 +1,4 @@
+dnl	$OpenBSD: install,v 1.49 2002/03/30 22:52:58 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -185,85 +186,22 @@ OpenBSDBootMsgs
 	you should choose the terminal type from amongst those listed.
 	(If your terminal type is xterm, just use vt100).
 
-	After entering the terminal type you will be greeted by a
-	welcome message and asked if you really want to continue.
-	Assuming you answered yes, 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".
-	Reply with the name of your disk.
-
-	Next you will have to edit or create a disklabel for the disk
-	OpenBSD is being installed on.  The installation script will
-	invoke the text editor allowing you to do this.  Note that
-	partition 'c' inside this disk label should ALWAYS reflect the
-	entire disk, including any non-OpenBSD portions.  The root file
-	system should be in partition 'a', and swap is usually in partition
-	'b'.  It is recommended that you create separate partitions for
-	root and /usr, you may also want to specify /var and /home
-	partitions.
-
-	The swap partition (usually 'b') should have a type of "swap", all
-	other native OpenBSD partitions should have a type of "4.2BSD".
-	Block and fragment sizes are usually 8192 and 1024 bytes, but can
-	also be 16384 and 2048 bytes.
-
-	The install program will now label your disk and ask which file
-	systems should be created on which partitions.  It will auto-
-	matically 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 (e.g.
-	"sd0") with the letter identifying the partition (e.g. "d")
-	appended (e.g. "sd0d").  Then it will ask where this partition is
-	to be mounted, e.g. /usr.  This process will be repeated until
-	you type "done".
-
-	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.
-
-	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 media flags to set.  This is driver
-	dependent, but for the MACHINE le(4) driver, the flags usually carry
+OpenBSDInstallPart3
+
+OpenBSDInstallPart4
+
+OpenBSDInstallPart5(sd0)
+
+OpenBSDInstallNet(linkflags)dnl
+ This is driver dependent, but for
+	the MACHINE le(4) driver, the flags usually carry the following
 	meaning:
 
 		autoselect	Use existing setting (default)
 		10baseT		Use UTP (twisted pair) port
 		10base5 	Use AUI port
 
-*** IMPORTANT - these are the correct setting for Sparc ethernet cards,
-		the suggestions shown by the install script are generic
-		and may or may not be correct...
-
-	After all network interfaces have 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 have been completed, you will be
-	able to extract the distribution sets onto your system.  There
-	are several install methods supported; FTP, HTTP, tape, CD-ROM, NFS
-	or a local disk partition.  Note that installation from floppies
-	is not currently supported.
+OpenBSDInstallNet2({:-CD-ROM, NFS, -:},nofloppy)
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install
index ad3c2c650bd..99ade14fee3 100644
--- a/distrib/notes/sparc64/install
+++ b/distrib/notes/sparc64/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.20 2002/03/28 19:54:40 miod Exp $
+dnl	$OpenBSD: install,v 1.21 2002/03/30 22:52:58 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -129,9 +129,7 @@ OpenBSDBootMsgs
 	(If your terminal type is xterm, just use vt100).
 
 dnl put this back for 3.2
-dnl	After entering the terminal type you will be asked whether you
-dnl	wish to do an "(I)nstall" or an "(U)pgrade".  Enter 'I' for a
-dnl	fresh install or 'U' to upgrade an existing installation.
+dnl OpenBSDInstallpart3({:- or "wd0" for IDE drives-:})
 	After entering the terminal type you will be asked whether you
 	wish to do an "(I)nstall".  Enter 'I' for a fresh installation.
 	Note that you cannot upgrade a previous OpenBSD installation
@@ -143,70 +141,15 @@ dnl	fresh install or 'U' to upgrade an existing installation.
 	it can install on, and ask you which it should use.  The name
 	of the disk is typically "sd0" for SCSI drives and "wd0" for
 	IDE drives. Reply with the name of your disk.
+dnl end put this back
 
-	Next you will have to edit or create a disklabel for the disk
-	OpenBSD is being installed on.  The installation script will
-	invoke the text editor allowing you to do this.  Note that
-	partition 'c' inside this disk label should ALWAYS reflect the
-	entire disk, including any non-OpenBSD portions.  The root file
-	system should be in partition 'a', and swap is usually in partition
-	'b'.  It is recommended that you create separate partitions for
-	root and /usr, you may also want to specify /var and /home
-	partitions.
-
-	The swap partition (usually 'b') should have a type of "swap", all
-	other native OpenBSD partitions should have a type of "4.2BSD".
-	Block and fragment sizes are usually 8192 and 1024 bytes, but can
-	also be 16384 and 2048 bytes.
-
-	The install program will now label your disk and ask which file
-	systems should be created on which partitions.  It will auto-
-	matically 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 (e.g.
-	"sd0") with the letter identifying the partition (e.g. "d")
-	appended (e.g. "sd0d").  Then it will ask where this partition is
-	to be mounted, e.g. /usr.  This process will be repeated until
-	you type "done".
-
-	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.
-
-	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 media flags to set. It is usually safe
-	to keep the default settings.
-
-	After all network interfaces have 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 have been completed, you will be
-	able to extract the distribution sets onto your system.  There
-	are several install methods supported; FTP, HTTP, tape, CD-ROM, NFS
-	or a local disk partition.  Note that installation from floppies
-	is not currently supported.
+OpenBSDInstallPart4
+
+OpenBSDInstallPart5(sd0)
+
+OpenBSDInstallNet
+
+OpenBSDInstallNet2({:-CD-ROM, NFS, -:},nofloppy)
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/sun3/install b/distrib/notes/sun3/install
index 4ef6c99a545..4c7ef7a51ff 100644
--- a/distrib/notes/sun3/install
+++ b/distrib/notes/sun3/install
@@ -1,3 +1,4 @@
+dnl	$OpenBSD: install,v 1.17 2002/03/30 22:52:58 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -113,85 +114,21 @@ OpenBSDBootMsgs
 	you should choose the terminal type from amongst those listed.
 	(If your terminal type is xterm, just use vt100).
 
-	After entering the terminal type you will be greeted by a
-	welcome message and asked if you really want to continue.
-	Assuming you answered yes, 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".
-	Reply with the name of your disk.
-
-	Next you will have to edit or create a disklabel for the disk
-	OpenBSD is being installed on.  The installation script will
-	invoke the text editor allowing you to do this.  Note that
-	partition 'c' inside this disk label should ALWAYS reflect the
-	entire disk, including any non-OpenBSD portions.  The root file
-	system should be in partition 'a', and swap is usually in partition
-	'b'.  It is recommended that you create separate partitions for
-	root and /usr, you may also want to specify /var and /home
-	partitions.
-
-	The swap partition (usually 'b') should have a type of "swap", all
-	other native OpenBSD partitions should have a type of "4.2BSD".
-	Block and fragment sizes are usually 8192 and 1024 bytes, but can
-	also be 16384 and 2048 bytes.
-
-	The install program will now label your disk and ask which file
-	systems should be created on which partitions.  It will auto-
-	matically 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 (e.g.
-	"sd0") with the letter identifying the partition (e.g. "d")
-	appended (e.g. "sd0d").  Then it will ask where this partition is
-	to be mounted, e.g. /usr.  This process will be repeated until
-	you type "done".
-
-	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.
-
-	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.  This is driver dependent, but for the
-	MACHINE le(4) driver, the flags usually carry meaning:
+OpenBSDInstallPart3
 
-		-link0 -link1	Use existing setting (default)
-		link0 -link1	Use UTP (twisted pair) port
-		-link0 link1 	Use AUI port
+OpenBSDInstallPart4
 
-*** IMPORTANT - these are the correct setting for MACHINE ethernet cards,
-		the suggestions shown by the install script are generic
-		and may or may not be correct...
+OpenBSDInstallPart5(sd0)
 
-	After all network interfaces have 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.
+OpenBSDInstallNet(linkflags)dnl
+ The flags usually carry the following
+	meaning:
 
-	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.
+		-link0 -link1	Use existing setting (default)
+		link0 -link1	Use UTP (twisted pair) port
+		-link0 link1 	Use AUI port
 
-	After these preparatory steps have been completed, you will be
-	able to extract the distribution sets onto your system.  There
-	are several install methods supported; FTP, HTTP, tape, CD-ROM, NFS
-	or a local disk partition.
+OpenBSDInstallNet2({:-CD-ROM, NFS, -:})
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/vax/install b/distrib/notes/vax/install
index 64e3e36ff16..0353e1d6702 100644
--- a/distrib/notes/vax/install
+++ b/distrib/notes/vax/install
@@ -1,3 +1,4 @@
+dnl	$OpenBSD: install,v 1.9 2002/03/30 22:52:58 miod Exp $
 OpenBSDInstallPrelude
 
 For most systems, the easiest way to install OpenBSD/MACHINE OSREV is via
@@ -89,78 +90,15 @@ OpenBSDBootMsgs
 	the terminal type from amongst those listed.
 	(If your terminal type is xterm, just use vt100).
 
-	After entering the terminal type you will be asked whether you
-	wish to do an "(I)nstall" or an "(U)pgrade".  Enter 'I' for a
-	fresh install or 'U' to upgrade an existing installation.
-	
-	You will be presented with a welcome message and asked if
-	you really want to continue. Assuming you answered yes, 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". Reply with the name of your disk.
-
-	Next you will have to edit or create a disklabel for the disk
-	OpenBSD is being installed on.  The installation script will
-	invoke the text editor allowing you to do this.  Note that
-	partition 'c' inside this disk label should ALWAYS reflect the
-	entire disk, including any non-OpenBSD portions.  The root file
-	system should be in partition 'a', and swap is usually in partition
-	'b'.  It is recommended that you create separate partitions for
-	root and /usr, you may also want to specify /var and /home
-	partitions.
-
-	The swap partition (usually 'b') should have a type of "swap", all
-	other native OpenBSD partitions should have a type of "4.2BSD".
-	Block and fragment sizes are usually 8192 and 1024 bytes, but can
-	also be 16384 and 2048 bytes.
-
-	The install program will now label your disk and ask which file
-	systems should be created on which partitions.  It will auto-
-	matically 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 (e.g.
-	"sd0") with the letter identifying the partition (e.g. "d")
-	appended (e.g. "sd0d").  Then it will ask where this partition is
-	to be mounted, e.g. /usr.  This process will be repeated until
-	you type "done".
-
-	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.
-
-	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 media flags to set.
-
-	After all network interfaces have 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 have been completed, you will be
-	able to extract the distribution sets onto your system.  There
-	are several install methods supported; FTP, HTTP, tape, CD-ROM, NFS
-	or a local disk partition.  Note that installation from floppies
-	is not currently supported.
+OpenBSDInstallPart3
+
+OpenBSDInstallPart4
+
+OpenBSDInstallPart5(sd0)
+
+OpenBSDInstallNet
+
+OpenBSDInstallNet2({:-CD-ROM, NFS, -:})
 
 OpenBSDFTPInstall