s/cpp/m4/g

1 files changed, 20 insertions, 212 deletions

diff --git a/distrib/notes/amiga/install b/distrib/notes/amiga/install
index d136fc638ee..295961e4378 100644
--- a/distrib/notes/amiga/install
+++ b/distrib/notes/amiga/install
@@ -1,15 +1,6 @@
-Installing OpenBSD is a relatively complex process, but, if you have
-this document in hand and are careful to read and remember the
-information which is presented to you by the install program, it
-shouldn't be too much trouble.
+OpenBSDInstallPrelude
 
-Before you begin, you must have already prepared your hard disk as
-detailed in the section on preparing your system for install.
-
-The following is a walk-through of the steps necessary to get OpenBSD
-installed on your hard disk.  If you wish to stop the installation,
-you may hit Control-C at any prompt, but if you do, you'll have to
-begin again from scratch.
+OpenBSDInstallPart2
 
 	If you have a small machine (less than 6MB of fast RAM) you'll
 	have to setup a miniroot filesystem in the swap partition, as
@@ -35,7 +26,7 @@ begin again from scratch.
 
 
 	If you have an AGA machine, and your monitor will handle
-	the dblNTSC mode, you may also include the "-A" option to
+	the dblNTSC mode, you may also {:-include-:} the "-A" option to
 	enable the dblNTSC display mode.
 
 	You should see the screen clear and some information about
@@ -111,7 +102,7 @@ begin again from scratch.
 	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.
+	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
@@ -144,203 +135,20 @@ begin again from scratch.
 	images.  Note that installation from floppies are not currently
 	supported.
 
-	To install via FTP:
-		To begin an FTP install you will need the following
-		pieces of information.  Don't be daunted by this list;
-		the defaults are sufficient for most people.
-		    1) Proxy server URL if you are using a URL-based
-		       ftp proxy (squid, CERN ftp, Apache 1.2 or higher).
-		       You need to define a proxy if you are behind a
-		       firewall that blocks outgoing ftp (assuming you
-		       have a proxy available to use).
-		    2) Do you need to use passive mode ftp?  Most modern
-		       ftp servers are capable of dealing with passive
-		       ftp connections.  You only need to enable this
-		       option if you are behind a firewall that allows
-		       outgoing ftp but blocks incoming tcp ports > 1023.
-		       If in doubt say yes to this option.
-		       Note that you will not be asked about passive
-		       ftp if you are using a proxy.
-		    3) The IP address (or hostname if you enabled
-		       DNS earlier in the install) of an ftp server
-		       carrying the OpenBSD 2.3 distribution.
-		       If you don't know, just hit return when
-		       asked if you want to see a list of such hosts.
-		    4) The ftp directory holding the distribution sets.
-		       The default value of pub/OpenBSD/2.3/amiga
-		       is almost always correct.
-		    5) The login and password for the ftp account.
-		       The default will be correct unless you are
-		       doing non-anonymous ftp.
-
-		For instructions on how to complete the installation via
-		ftp, see the section named "Common URL installations" below.
-
-	To install via HTTP:
-		To begin an HTTP install you will need the following
-		pieces of information:
-		    1) Proxy server URL if you are using a URL-based
-		       http proxy (squid, CERN ftp, Apache 1.2 or higher).
-		       You need to define a proxy if you are behind a
-		       firewall that blocks outgoing http connections
-		       (assuming you have a proxy available to use).
-		    3) The IP address (or hostname if you enabled
-		       DNS earlier in the install) of an http server
-		       carrying the OpenBSD 2.3 distribution.
-		       If you don't know, just hit return when
-		       asked if you want to see a list of such hosts.
-		    4) The directory holding the distribution sets.
-		       There is no standard location for this;
-		       You should use the directory specified
-		       along with the server in the list of official
-		       http mirror sites that you received in step 3.
-
-		For instructions on how to complete the installation via
-		http, see the section named "Common URL installations" below.
-
-	To install from tape:
-		In order to install from tape, the distribution sets to be
-		installed must have been written to tape previously, either
-		in tar format or gzip-compressed tar format.
-
-		You will also have to identify the tape device where the
-		distribution sets are to be extracted from.  This will
-		typically be "nrst0" (no-rewind, raw interface).
-
-		Next you will have to provide the file number of the set
-		that is to be extracted.  Note that the file number starts
-		at 1, which is the first file written to the tape.
-
-		The install program will not automatically detect whether
-		an image has been compressed, so it will ask for that
-		information before starting the extraction.
-
-	To install from CD-ROM:
-		When installing from a CD-ROM, you will be asked which
-		device holds the distribution sets.  This will typically
-		be either "cd0" or "acd0".  Next you will be asked which
-		partition on the CD-ROM the distribution is to be loaded
-		from.  This is normally partition "a".
-
-		Next you will have to identify the file system type that
-		has been used to create the distribution on the CD-ROM,
-		this can be either FFS or ISO CD9660.  The OpenBSD CD
-		distribution uses the CD9660 format.
-
-		You will also have to provide the relative path to the
-		directory on the CD which holds the distribution, for the
-		amiga this is "2.3/amiga".
-
-		For instructions on how to complete the installation from
-		the CD-ROM distribution, see the section named "Common
-		file system installations" below.
-		
-	To install from a NFS mounted directory:
-		When installing from a NFS-mounted directory, you must
-		have completed network configuration above, and also
-		set up the exported file system on the NFS server in
-		advance.
-
-		First you must identify the IP address of the NFS server
-		to load the distribution from, and the file system the
-		server expects you to mount.
-
-		The install program will also ask whether or not TCP
-		should be used for transport (the default is UDP).  Note
-		that TCP only works with newer NFS servers.
-
-		You will also have to provide the relative path to the
-		directory on the file system where the distribution sets
-		are located.  Note that this path should not be prefixed
-		with a '/'.
-
-		For instructions on how to complete the installation from
-		the CD-ROM distribution, see the section named "Common
-		file system installations" below.
-
-	To install from a local disk partition:
-		When installing from a local disk partition, you will
-		first have to identify which disk holds the distribution
-		sets.  This is normally "sdN" or "wdN" where N is a
-		number 0 through 9.  Next you will have to identify the
-		partition within that disk that holds the distribution,
-		this is a single letter between 'a' and 'p'.
-
-		You will also have to identify the type of file system
-		residing in the partition identified.  Currently you can
-		install from partitions that has been formatted as
-		Berkeley fast file system (ffs) or AmigaDOS FFS (ados).
-
-		You will also have to provide the relative path to the
-		directory on the file system where the distribution sets
-		are located.  Note that this path should not be prefixed
-		with a '/'.
-
-		For instructions on how to complete the installation from
-		the a local disk partition, see the next section.
+OpenBSDFTPInstall
+
+OpenBSDHTTPInstall
+
+OpenBSDTAPEInstall
+
+OpenBSDCDROMInstall
+
+OpenBSDNFSInstall
+
+OpenBSDDISKInstall({:-"wdN" or -:},,{:- or AmigaDOS FFS (ados)-:})
 		
-	Common file system installations:
-		The following instructions are common to installations
-		from local disk partitions, NFS mounted directories and
-		CD-ROMs.
-
-		A list of available distribution sets will be listed.  If
-		any sets has already been extracted, those will be marked
-		with an X.  Enter the name of one distribution set at a
-		time, until all desired distribution sets has been
-		installed on your system.
-
-	Common URL installations:
-		Once you have entered the required information, the
-		install program will fetch a file list and present
-		a list of all the distribution sets that were found
-		in the specified directory.  (If no valid sets were found,
-		you will be notified and given the option of unpacking
-		any gzipped tar files found or getting a file list if
-		none were found.)
-
-		At this point you may individually select distribution
-		sets to install or enter "all" to install all of
-		the sets (which is what most users will want to do).
-		You may also enter "list" to get a file list or
-		"done" when you are done selecting distribution sets.
-		(It is also possible to enter an arbitrary filename
-		and have it treated as a file set).
-
-		Once you have selected the file sets you want to install
-		and entered "done" you will be prompted to verify that
-		you really do want to download and install the files.
-		Assuming you acquiesce, the files will begin to download
-		and unpack.  If not, you will be given the option of
-		installing sets via one of the other install methods.
-
-
-	When all the selected distribution sets has been extracted, you
-	will be allowed to select which time zone your system will be
-	using, all the device nodes needed by the installed system will
-	be created for you and the file systems will be unmounted.  For
-	this to work properly, it is expected that you have installed
-	at least the "base23" and "etc23" distribution sets.
-
-
-Congratulations, you have successfully installed OpenBSD 2.3.  When you
-reboot into OpenBSD, you should log in as "root" at the login prompt.
-There is no initial password, but if you're using the machine in a
-networked environment, you should create yourself an account and
-protect it and the "root" account with good passwords.  You should have
-got a mail from the install program we recommend you to read.  This you
-can do by running
-
-	mail
-
-and then just enter "1" to get at the first mail.  You quit mail by
-entering "q".
-
-Some of the files in the OpenBSD 2.3 distribution will need to be
-tailored for your site.  We recommend you run:
-
-	man afterboot
-
-which will tell you about a bunch of the files needing to be reviewed.
-If you are unfamiliar with UN*X-like system administration, it's
-recommended that you buy a book that discusses it.
+OpenBSDCommonFS
+
+OpenBSDCommonURL
+
+OpenBSDCongratulations