s/cpp/m4/g

6 files changed, 66 insertions, 314 deletions

diff --git a/distrib/notes/amiga/contents b/distrib/notes/amiga/contents
index f5112544a72..68b75af6167 100644
--- a/distrib/notes/amiga/contents
+++ b/distrib/notes/amiga/contents
@@ -1,29 +1,12 @@
-The amiga-specific portion of the OpenBSD 2.3 release is found in the
-"amiga" subdirectory of the distribution.  That subdirectory is laid
-out as follows:
+TopPart
 
-.../2.3/amiga/
-		INSTALL.amiga	This file.
+OpenBSDbsd
 
-		CKSUM		Output of the cksum(1) and md5(1) programs
-		MD5		usable for verification of the correctness
-				of downloaded files.
+OpenBSDrd
 
-		bsd		A generic OpenBSD kernel used both for
-				miniroot installation and as the first
-				"real" kernel your OpenBSD installation
-				will use.
+OpenBSDminiroot
 
-		bsd.rd		A ramdisk OpenBSD kernel used for simple
-				installation.
-
-		miniroot23.fs	A miniroot filesystem image to be used
-				if you for some reason can't or don't
-				want to use the ramdisk installation
-				method.
-
-		*.tar.gz	amiga binary distribution sets;
-				see below.
+OpenBSDdistsets
 
 		utils/		Miscellaneous amiga installation
 				utilities; see installation section, below.
@@ -42,67 +25,28 @@ Installation/upgrade miniroot file system:
 	NFS file system or ftp.  You can also load distribution sets from
 	a SCSI tape or from one of your existing AmigaDOS partitions.
 
-	This file is named "miniroot23.fs".
-
-
-The OpenBSD/amiga binary distribution sets contain the binaries which
-comprise the OpenBSD 2.3 release for the amiga.  There are seven binary
-distribution sets.  The binary distribution sets can be found in
-the "amiga" subdirectory of the OpenBSD 2.3 distribution tree,
-and are as follows:
-
-	base23	The OpenBSD/amiga 2.3 base binary distribution.  You
-		MUST install this distribution set.  It contains the
-		base OpenBSD utilities that are necessary for the
-		system to run and be minimally functional.  It
-		includes shared library support, and excludes
-		everything described below.
-		[ 11.2M gzipped, 33.9M uncompressed ]
-
-	comp23	The OpenBSD/amiga Compiler tools.  The C, C++, and
-		FORTRAN language environments are supported.  This set
-		includes the system include files (/usr/include), the
-		linker, the compiler tool chain, and the various system
-		libraries (except the shared libraries, which are
-		included as part of the base set).  This set also
-		includes the manual pages for all of the utilities it
-		contains, as well as the system call and library manual
-		pages.
-		[ 7.0M gzipped, 23.6M uncompressed ]
-
-	etc23	This distribution set contains the system configuration
-		files that reside in /etc and in several other places.
-		This set MUST be installed if you are installing the
-		system from scratch, but should NOT be used if you are
-		upgrading.  (If you are upgrading, it's recommended that
-		you get a copy of this set and CAREFULLY upgrade your
-		configuration files by hand.)
-		[ 92K gzipped, 490K uncompressed ]
-
-	game23	This set includes the games and their manual pages.
-		[ 2.7M gzipped, 6.7M uncompressed ]
-
-	man23	This set includes all of the manual pages for the
-		binaries and other software contained in the base set.
-		Note that it does not include any of the manual pages
-		that are included in the other sets.
-		[ 2.4M gzipped, 9.2M uncompressed ]
-
-	misc23	This set includes the system dictionaries (which are
-		rather large), the typesettable document set, and
-		man pages for other architectures which happen to be
-		installed from the source tree by default.
-		[ 1.7M gzipped, 5.8M uncompressed ]
-
-	text23	This set includes OpenBSD's text processing tools,
-		including groff, all related programs, and their
-		manual pages.
-		[ 945K gzipped, 3.5M uncompressed ]
-
-	xbase23 This set includes the base X distribution.  This includes
-		programs, headers, libraries, configuration files.
-
-	xfont23 This set includes all of the X fonts.
-
-	xserv23 This set includes all of the X servers.
+	This file is named "miniroot{:--:}OSrev.fs".
+
+
+DistributionDescription
+
+OpenBSDbase(11.2M,33.9M)
+
+OpenBSDcomp(7.0M,23.6M)
+
+OpenBSDetc(92K,490K)
+
+OpenBSDgame(2.7M,6.7M)
+
+OpenBSDman(2.4M,9.2M)
+
+OpenBSDmisc(1.7M,5.8M)
+
+OpenBSDtext(945K,3.5M)
+
+OpenBSDxbase
+
+OpenBSDxfont
+
+OpenBSDxserv
 
diff --git a/distrib/notes/amiga/hardware b/distrib/notes/amiga/hardware
index 994e7452adc..04a4e28413b 100644
--- a/distrib/notes/amiga/hardware
+++ b/distrib/notes/amiga/hardware
@@ -1,4 +1,4 @@
-OpenBSD/amiga 2.3 runs on any amiga that has a 68020, 68030, 68040 or
+OpenBSD/MACHINE OSREV runs on any amiga that has a 68020, 68030, 68040 or
 68060 CPU with some form of FPU and MMU.  It should also run on
 MacroSystem's DraCo computer.  The minimal configuration requires 4M of
 RAM and about 55M of disk space.  To install the entire system requires
@@ -22,7 +22,7 @@ large and bulky to accommodate all people).
 If you only have 4M of fast memory, you should make your swap partition
 larger, as your system will be doing much more swapping.
 
-Supported devices include:
+Supported devices {:-include-:}:
 	A4000/A1200 IDE controller.
 	ISA IDE & ATAPI with a supported ISA bridge.
 		[Note: With single ATAPI device IDE busses, the
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
diff --git a/distrib/notes/amiga/prep b/distrib/notes/amiga/prep
index 938ddf6f9bf..4a6b84a3372 100644
--- a/distrib/notes/amiga/prep
+++ b/distrib/notes/amiga/prep
@@ -109,7 +109,7 @@ Transferring the miniroot filesystem:
 	for swapping.
 
 	Once the hard disk has been prepared for OpenBSD, the miniroot
-	filesystem (miniroot23.fs) is transferred to the swap partition
+	filesystem (miniroot{:--:}OSrev.fs) is transferred to the swap partition
 	configured during the hard disk prep (or the existing swap
 	partition in the case of an upgrade).  The xstreamtodev utility
 	provided in the "amiga/utilities" directory can be used on
@@ -122,18 +122,18 @@ Transferring the miniroot filesystem:
 	swap partition.
 
 	On AmigaDOS, the command:
-		xstreamtodev --input=miniroot23.fs --rdb-name=<swap partition>
+		xstreamtodev --input=miniroot{:--:}OSrev.fs --rdb-name=<swap partition>
 	where <swap partition> is the name you gave to the OpenBSD
 	partition to be used for swapping.  If xstreamtodev is unable to
 	determine the SCSI driver device name or the unit number of the
-	specified partition, you may also need to include the option
+	specified partition, you may also need to {:-include-:} the option
 	"--device=<driver.name>" and/or "--unit=<SCSI unit number>".
 
 	To transfer the miniroot using an older BSD, you should be booted
 	up in single user state on the current system, or use the
 	"shutdown now" command to shutdown to single-user state.  Then
 	copy the miniroot using dd:
-		dd if=miniroot23.fs of=/dev/rsdXb
+		dd if=miniroot{:--:}OSrev.fs of=/dev/rsdXb
 	where /dev/rsdXb should be the device path of the swap partition
 	your system is configured to use.  Once the file is copied,
 	reboot back to AmigaDOS to boot the new OpenBSD kernel.  NOTE:
diff --git a/distrib/notes/amiga/upgrade b/distrib/notes/amiga/upgrade
index ee8a38d07db..766cd78b48f 100644
--- a/distrib/notes/amiga/upgrade
+++ b/distrib/notes/amiga/upgrade
@@ -1,13 +1,13 @@
-The upgrade to OpenBSD 2.3 is a binary upgrade; it would be prohibitive
-to make users upgrade by compiling and installing the 2.3 sources, and
+The upgrade to OpenBSD OSREV is a binary upgrade; it would be prohibitive
+to make users upgrade by compiling and installing the OSREV sources, and
 it would be very difficult to even compile a set of instructions that
 allowed them to do so.
 
 To do the upgrade, and if you are using the miniroot installation, you
 must have the OpenBSD kernel on AmigaDOS and you must transfer the root
-filesystem miniroot23.fs onto the swap partition of the OpenBSD hard disk.
+filesystem miniroot{:--:}OSrev.fs onto the swap partition of the OpenBSD hard disk.
 If you are using the ramdisk installation, the bsd.rd kernel is enough.
-You must also have at least the "base23" binary distribution set available,
+You must also have at least the "base{:--:}OSrev" binary distribution set available,
 so that you can upgrade with it, using one of the upgrade methods described
 above.  Finally, you must have sufficient disk space available to install
 the new binaries.  Since the old binaries are being overwritten in place,
@@ -32,7 +32,7 @@ To upgrade your system, follow the following instructions:
 	partition used by OpenBSD for swapping, as described in the
 	"Preparing your System for OpenBSD Installation" section above.
 
-	Now boot up OpenBSD using the 2.3 kernel using the loadbsd
+	Now boot up OpenBSD using the OSREV kernel using the loadbsd
 	command:
 
 		loadbsd -b bsd
@@ -48,7 +48,7 @@ To upgrade your system, follow the following instructions:
 
 	Ramdisk installation:
 
-	Now boot up OpenBSD using the 2.3 kernel using the loadbsd
+	Now boot up OpenBSD using the OSREV kernel using the loadbsd
 	command:
 
 		loadbsd bsd.rd
@@ -95,14 +95,14 @@ To upgrade your system, follow the following instructions:
 	After the software has been transferred to the machine (or
 	mounted, in the case of upgrading via NFS).
 
-Your system has now been upgraded to OpenBSD 2.3.
+Your system has now been upgraded to OpenBSD OSREV.
 
-	After all this, your machine is a complete OpenBSD 2.3 system.
+	After all this, your machine is a complete OpenBSD OSREV system.
 	However, that doesn't mean that you're finished with the upgrade
 	process.  There are several things that you should do, or might
 	have to do, to insure that the system works properly.
 
-	First, you will probably want to get the etc23.tar.gz distribution,
+	First, you will probably want to get the etc{:--:}OSrev.tar.gz distribution,
 	extract it, and compare its contents with those in your /etc/
 	directory.  You will probably want to replace some of your
 	system configuration files, or incorporate some of the changes
diff --git a/distrib/notes/amiga/xfer b/distrib/notes/amiga/xfer
index a764d2e6508..85a09316286 100644
--- a/distrib/notes/amiga/xfer
+++ b/distrib/notes/amiga/xfer
@@ -24,7 +24,7 @@ partition, optionally you must also get the miniroot image there
 for later transfer to your swap partition as explained elsewhere.
 For ramdisk installs you need to get both the bsd and bsd.rd
 kernel images, and for miniroot installs you need bsd and the
-miniroot23.fs image.
+miniroot{:--:}OSrev.fs image.
 
 To prepare for installing via an AmigaDOS partition:
 
@@ -104,7 +104,7 @@ following:
 	Place the distribution sets you wish to upgrade somewhere in
 	your current file system tree.  At a bare minimum, you must
 	upgrade the "base" binary distribution, and so must put the
-	"base23.tar.gz" set somewhere in your file system.  If you wish,
+	"base{:--:}OSrev.tar.gz" set somewhere in your file system.  If you wish,
 	you can do the other sets, as well, but you should NOT upgrade
 	the "etc" distribution; the "etc" distribution contains system
 	configuration files that you should review and update by hand.