s/cpp/m4/g

64 files changed, 1126 insertions, 2502 deletions

diff --git a/distrib/notes/INSTALL b/distrib/notes/INSTALL
index cd2ba6175a9..1a4d4121b4f 100644
--- a/distrib/notes/INSTALL
+++ b/distrib/notes/INSTALL
@@ -1,4 +1,5 @@
-INSTALLATION NOTES for OpenBSD/MACHINE 2.3
+include(INCLUDE/../m4.common)dnl
+INSTALLATION NOTES for OpenBSD/MACHINE OSREV
 
 
 What is OpenBSD?
@@ -21,7 +22,7 @@ information-gathering problems.  Tools like ipf, ipnat, and nc have
 been added to the tree because security conscious people often need
 them.
 
-OpenBSD 2.3 has significantly enhanced the binary emulation subsystem
+OpenBSD OSREV has significantly enhanced the binary emulation subsystem
 (which includes iBCS2, Linux, OSF/1, SunOS, SVR4, Solaris and Ultrix
 compatibility) and several kernel subsystems have been generalized to
 support this more readily.  The binary emulation strategy is aimed at
@@ -34,51 +35,53 @@ has entered the US.  Because of this, take care NOT to get the distrib-
 ution from an FTP server in the US if you are outside of Canada and
 the US.
 
-Many new user programs have been added in OpenBSD 2.3, as well,
+Many new user programs have been added in OpenBSD OSREV, as well,
 bringing it closer to our goal of supplying a complete and modern
 UN*X-like environment.  Tools like perl and ksh are standard, as are
 numerous other useful tools.
 
-#include "whatis"
+includeit(whatis)dnl
+
 
 Sources of OpenBSD:
 -------------------
 
-#include "mirrors"
+includeit(mirrors)dnl
+
 
-OpenBSD 2.3 Release Contents:
+OpenBSD OSREV Release Contents:
 -----------------------------
 
-The OpenBSD 2.3 release is organized in the following way.  In the
-.../2.3 directory, for each of the architectures having an OpenBSD 2.3
+The OpenBSD OSREV release is organized in the following way.  In the
+.../OSREV directory, for each of the architectures having an OpenBSD OSREV
 binary distribution, there is a sub-directory.
 
-#include "contents"
+includeit(contents)
 
 OpenBSD System Requirements and Supported Devices:
 --------------------------------------------------
 
-#include "hardware"
+includeit(hardware)
 
 Getting the OpenBSD System onto Useful Media:
 ---------------------------------------------
 
-#include "xfer"
+includeit(xfer)
 
 Preparing your System for OpenBSD Installation:
 -----------------------------------------------
 
-#include "prep"
+includeit(prep)
 
 Installing the OpenBSD System:
 ------------------------------
 
-#include "install"
+includeit(install)
 
 Upgrading a previously-installed OpenBSD System:
 ------------------------------------------------
 
-#include "upgrade"
+includeit(upgrade)
 
 Getting source code for your OpenBSD System:
 --------------------------------------------
@@ -134,10 +137,10 @@ If you are unsure of what man page you are looking for, enter
 where "subject-word" is your topic of interest; a list of possibly 
 related man pages will be displayed.
 
-Adding third party software; ``packages' and ``ports'':
+Adding third party software; ``packages'' and ``ports'':
 -------------------------------------------------------
 
-#include "packages"
+includeit(packages)
 
 Administrivia:
 --------------
@@ -151,7 +154,7 @@ comp.unix.bsd.openbsd.misc for general OpenBSD discussion.
 
 To report bugs, use the 'sendbug' command shipped with OpenBSD,
 and fill in as much information about the problem as you can.  Good
-bug reports include lots of details.  Additionally, bug reports can
+bug reports {:-include-:} lots of details.  Additionally, bug reports can
 be sent by mail to:
 
 	bugs@OpenBSD.ORG
diff --git a/distrib/notes/Makefile b/distrib/notes/Makefile
index 6ca3bbdd063..450007deff5 100644
--- a/distrib/notes/Makefile
+++ b/distrib/notes/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 1998/04/23 13:33:16 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.10 1998/05/18 00:33:16 todd Exp $
 
 NOPROG=
 NOMAN=
@@ -10,12 +10,16 @@ SRC=	$(.CURDIR)/INSTALL
 DEP=	$(SRC) $(.CURDIR)/mirrors $(.CURDIR)/$M/whatis $(.CURDIR)/$M/contents \
 	$(.CURDIR)/$M/hardware $(.CURDIR)/$M/xfer $(.CURDIR)/$M/prep \
 	$(.CURDIR)/$M/install $(.CURDIR)/$M/upgrade $(.CURDIR)/donations \
-	$(.CURDIR)/packages
+	$(.CURDIR)/packages $(.CURDIR)/m4.common
 
 all:	$(TARG)
 
+allarchs:
+	@cd $(.CURDIR); for m in alpha amiga arc atari hp300 i386 mac68k mvme68k pc532 pmax powerpc sparc sun3; do make MACHINE=$$m; done
+
 $(TARG): $(DEP)
-	cpp -I$(.CURDIR)/$M -DMACHINE=$M -Uunix -Ui386 -U$M -C -P $(SRC) > $@
+	m4 -DOSREV=$(OSREV) -DOSrev=$(OSrev) -DINCLUDE=$(.CURDIR)/$M \
+	-DMACHINE=$M -Uunix $(SRC) > $@
 
 clean cleandir:
 	-/bin/rm -f INSTALL.*
diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index 3e42a7df7f6..b7c097e9902 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -1,99 +1,34 @@
-The alpha-specific portion of the OpenBSD 2.3 release is found in the
-"alpha" subdirectory of the distribution.  That subdirectory is laid
-out as follows:
-
-.../2.3/alpha/
-		INSTALL.alpha	Installation notes; this file.
-
-		CKSUM		Output of the cksum(1) and md5(1) programs
-		MD5		usable for verification of the correctness
-				of downloaded files.
-
-		floppy23.fs	The alpha boot and installation
-				floppy; see below.
-
-		*.tar.gz	alpha binary distribution sets;
-				see below.
-
-		bsd		A stock GENERIC alpha kernel which
-				will be installed on your system
-				during the install.
-
-		bsd.rd		A ramdisk OpenBSD kernel used for simple
-				installation.
-
-In summary, there is one alpha floppy image called "floppy.fs".  This
-is a bootable install floppy which can be used both to install and to
-upgrade OpenBSD to the current version.  It is also useful for maintenance
-and disaster recovery.
-
-Bootable installation/upgrade floppy:
-
-	This disk contains a file system, is bootable, and has
-	enough utilities on board to prepare your hard disk drive
-	for OpenBSD and to install the OpenBSD distribution.
-
-	It also holds the utilities needed in order to upgrade a
-	system to the current version of OpenBSD.
-
-The OpenBSD/alpha binary distribution sets contain the binaries which
-comprise the OpenBSD 2.3 release for the alpha.  There are seven binary
-distribution sets.  The binary distribution sets can be found in
-the "alpha" subdirectory of the OpenBSD 2.3 distribution tree,
-and are as follows:
-
-	base23	The OpenBSD/alpha 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.
-		[ 38.3M gzipped, 106.5M uncompressed ]
-
-	comp23	The OpenBSD/alpha Compiler tools.  All of the tools
-		relating to C, C++, and FORTRAN (yes, there are two!).
-		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.
-		[ 13.3M gzipped, 48.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.)
-		[ 92.0K gzipped, 490K uncompressed ]
-
-	game23	This set includes the games and their manual pages.
-		[ 5.9M gzipped, 15.5M 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.9M uncompressed ]
-
-	text23	This set includes OpenBSD's text processing tools,
-		including groff, all related programs, and their
-		manual pages.
-		[ 1.7M gzipped, 5.6M 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.
+TopPart
+
+OpenBSDfloppy
+
+OpenBSDdistsets
+
+OpenBSDbsd
+
+OpenBSDrd
+
+OpenBSDfloppydesc
+
+DistributionDescription
+
+OpenBSDbase(38.3M,106.5M)
+
+OpenBSDcomp(13.3M,48.6M)
+
+OpenBSDetc(92.0K, 490K)
+
+OpenBSDgame(5.9M, 15.5M)
+
+OpenBSDman(2.4M, 9.2M)
+
+OpenBSDmisc(1.7M,5.9M)
+
+OpenBSDtext(1.7M,5.6M)
+
+OpenBSDxbase
+
+OpenBSDxfont
+
+OpenBSDxserv
 
diff --git a/distrib/notes/alpha/hardware b/distrib/notes/alpha/hardware
index 3ef8c798d26..6d4e59a2985 100644
--- a/distrib/notes/alpha/hardware
+++ b/distrib/notes/alpha/hardware
@@ -1,4 +1,4 @@
-OpenBSD/alpha 2.3 is expected to run on the following hardware.
+OpenBSD/MACHINE OSREV is expected to run on the following hardware.
 If you have hardware that is listed here and are unable to run
 OpenBSD, or if you are able to run OpenBSD on hardware not listed
 here, please send mail to <tech@openbsd.org> with as much information
diff --git a/distrib/notes/alpha/install b/distrib/notes/alpha/install
index e5fa2abb5ba..76d5a4b13e2 100644
--- a/distrib/notes/alpha/install
+++ b/distrib/notes/alpha/install
@@ -1,28 +1,8 @@
-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 should know the geometry of your hard disk, i.e.
-the sector size (note that sector sizes other than 512 bytes are not
-currently supported), the number of sectors per track, the number of
-tracks per cylinder (also known as the number of heads), and the
-number of cylinders on the disk.  The OpenBSD kernel will try to
-discover these parameters on its own, and if it can it will print them
-at boot time.  If possible, you should use the parameters it prints.
-(You might not be able to if your disk is so old that the
-kernel can't figure out its geometry.)
+OpenBSDInstallPart2
 
-You should now be ready to install OpenBSD.
-
-The following is a walk-through of the steps you will take while
-getting OpenBSD installed on your hard disk.  If any question has a
-default answer, it will be displayed in brackets ("[]") after the
-question.  If you wish to stop the installation, you may hit Control-C
-at any time, but if you do, you'll have to begin the installation
-process again from scratch.
-
-	If you are using the floppy.fs floppy, type "boot dva0"
+	If you are using the floppy{:--:}OSrev.fs floppy, type "boot dva0"
 	and hit return when presented with the SRM console prompt.
 	You should see info about the primary and secondary boot
 	and then the kernel should start to load.  It will take a
@@ -38,7 +18,7 @@ process again from scratch.
 	hit return when presented with the SRM console prompt.
 	You should see a list of devices; the SCSI devices will
 	start with "DKA".  Find the SCSI device that is your CD-ROM
-	and enter "boot dka4 -fi 2.3/alpha/bsd", assuming that your
+	and enter "boot dka4 -fi OSREV/alpha/bsd", assuming that your
 	CD-ROM was listed as DKA4* (substitute the SCSI id of your
 	CD-ROM for the "4").  You should see info about the primary
 	and secondary boot and then the kernel should start to
@@ -47,14 +27,7 @@ process again from scratch.
 	have a hardware problem or your alpha is not currently
 	supported by OpenBSD; try booting from a floppy instead.
 
-	Once the kernel has loaded, you will be presented with the
-	OpenBSD kernel boot messages.  You will want to read them
-	to determine your disk's name and geometry.  Its name will
-	be something like "sd0" or "wd0" and the geometry will be
-	printed on a line that begins with its name.  As mentioned
-	above, you will need your disk's geometry when creating
-	OpenBSD partitions.  You will also need to know the device
-	name to tell the install tools what disk to install on.
+OpenBSDBootMsgs
 
 	While booting, you will probably see several warnings.  You
 	should be warned that the kernel can't figure out what device
@@ -126,7 +99,7 @@ process 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
@@ -159,206 +132,20 @@ process again from scratch.
 	images.  Note that installation from floppies is 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 active mode ftp?  By default,
-		       ftp will attempt to use passive mode and fall
-		       back to an active connection if the server does
-		       not support passive mode.  You only need to enable
-		       this option if you are connecting to a buggy ftp
-		       daemon that implements passive ftp incorrectly.
-		       Note that you will not be asked about active
-		       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/alpha
-		       is almost always correct.
-		    5) The login and password for the ftp account.
-		       You will only be asked for a password for
-		       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).
+OpenBSDFTPInstall
 
-		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.
+OpenBSDHTTPInstall
 
-		The install program will not automatically detect whether
-		an image has been compressed, so it will ask for that
-		information before starting the extraction.
+OpenBSDTAPEInstall
 
-	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".
+OpenBSDCDROMInstall
 
-		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
-		alpha this is "2.3/alpha".
-
-		For instructions on how to complete the installation from
-		the CD-ROM distribution, see the section named "Common
-		file system installations" below.
+OpenBSDNFSInstall
 		
-	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
-		only install from partitions that use the fast file system
-		(ffs).
-
-		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.
-		
-	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.
-		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.  You may also use wildcards in place of
-		a file name, eg `*.tar.gz' or even `base*|comp*'.  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 extract file sets.  Assuming you
-		acquiesce, the files will begin to extract.  If not, you
-		will be given the option of installing sets via one of
-		the other install methods.
-
-	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.  You may also
-		use wildcards in place of a file name, eg `*.tar.gz' or
-		even `base*|comp*'.  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.
+OpenBSDDISKInstall({:-"wdN" or -:},{:-only -:})
 
+OpenBSDCommonFS
 
-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.
+OpenBSDCommonURL
 
-Some of the files in the OpenBSD 2.3 distribution might need to be
-tailored for your site.  In particular, the /etc/sendmail.cf file will
-almost definitely need to be adjusted, and other files in /etc will
-probably need to be modified, as well.  If you are unfamiliar with
-UN*X-like system administration, it's recommended that you buy a book
-that discusses it.
+OpenBSDCongratulations
diff --git a/distrib/notes/alpha/prep b/distrib/notes/alpha/prep
index 929c3a4b2a9..425e92c9418 100644
--- a/distrib/notes/alpha/prep
+++ b/distrib/notes/alpha/prep
@@ -49,7 +49,7 @@ Using the SRM console:
     Some variables you will want to set:
 	auto_action	Determines what happens when you turn power
 			on, halt, or crash your machine.  Valid
-			values include "halt", "boot", and "restart".
+			values {:-include-:} "halt", "boot", and "restart".
 			Most users will want to set this to "boot".
 	bootdef_dev	Default boot device (or list of devices).
 	boot_file	Name of the kernel to boot.  If you don't set
diff --git a/distrib/notes/alpha/whatis b/distrib/notes/alpha/whatis
index 55717b75555..32d18f6a653 100644
--- a/distrib/notes/alpha/whatis
+++ b/distrib/notes/alpha/whatis
@@ -1,4 +1,4 @@
-OpenBSD 2.3 is the second formal release of OpenBSD for the
+OpenBSD OSREV is the second formal release of OpenBSD for the
 alpha processor.
 
 The worlds briefest but still comprehensive introduction to the Alpha:
diff --git a/distrib/notes/alpha/xfer b/distrib/notes/alpha/xfer
index c82a37b4749..dce80c9877e 100644
--- a/distrib/notes/alpha/xfer
+++ b/distrib/notes/alpha/xfer
@@ -20,18 +20,18 @@ To boot from CD-ROM:
 	ignore them (unless it is DKA0).  For example, if your
 	cdrom is listed as DKA600, you want to use dka6 (device
 	ID's are case insensitive).  Insert the OpenBSD/alpha CD
-	and enter "boot -fi 2.3/alpha/bsd.rd DEVICE" where DEVICE is
+	and enter "boot -fi OSREV/alpha/bsd.rd DEVICE" where DEVICE is
 	the dka device.  Note that the argument order is important
 	here.  If this does not work, you'll have to create a boot
 	floppy or bootable hard disk; follow the directions below.
 	(A boot floppy image is included on the CD-ROM as
-	2.3/alpha/floppy.fs.)
+	OSREV/{:--:}MACHINE/floppy{:--:}OSrev.fs.)
 
 If you have a floppy drive on your alpha:
 
 	If you are using a UN*X-like system to write the floppy
 	image to disk, you should use the "dd" command to copy the
-	file system image (floppy.fs) directly to the raw floppy
+	file system image (floppy{:--:}OSrev.fs) directly to the raw floppy
 	disk.  It is suggested that you read the dd(1) manual page
 	or ask your system administrator to determine the correct
 	set of arguments to use; it will be slightly different from
@@ -41,7 +41,7 @@ If you have a floppy drive on your alpha:
 	If you are using a DOS PC to write the floppy image to
 	disk, you should use the "rawrite" utility, provided in
 	the "i386/inst" directory of the OpenBSD distribution.  It
-	will write the file system image (floppy.fs) to a disk.
+	will write the file system image (floppy{:--:}OSrev.fs) to a disk.
 	You can boot it using "boot dva0".
 
 	Note that, when installing, the floppy can be write-protected (i.e.
@@ -56,7 +56,7 @@ If you don't have a floppy drive on your alpha:
 	You must use a UN*X-like system to write the floppy image
 	to the hard disk you will be using for OpenBSD/alpha.  You
 	should use the "dd" command to copy the file system image
-	(floppy.fs) directly to the raw 'c' device (whole disk) of
+	(floppy{:--:}OSrev.fs) directly to the raw 'c' device (whole disk) of
 	the target hard disk.  It is suggested that you read the
 	dd(1) manual page or ask your system administrator to
 	determine the correct set of arguments to use; it will be
@@ -94,13 +94,13 @@ following:
 	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 "base23" and "etc23" distributions on tape (in order
+	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 .../2.3		# the top of the tree
-		cd alpha/
-		tar cf <tape_device> base23 etc23
+		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.)
@@ -153,7 +153,7 @@ 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 "base23" set somewhere in your file system.  If
+	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
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.
diff --git a/distrib/notes/arc/contents b/distrib/notes/arc/contents
index ca6b056d8fc..ff24cf9a30d 100644
--- a/distrib/notes/arc/contents
+++ b/distrib/notes/arc/contents
@@ -1,90 +1,37 @@
-The ARC specific portion of the OpenBSD 2.3 release is found in the
-"arc" subdirectory of the distribution.  That subdirectory is laid
-out as follows:
+TopPart
 
-.../2.3/arc/
-		INSTALL.arc	Installation notes; this file.
+OpenBSDbsd
 
-		CKSUM		Output of the cksum(1) and md5(1) programs
-		MD5		usable for verification of the correctness
-				of downloaded files.
-
-		*.gz		ARC binary distribution sets;
-				see below.
-
-		bsd		ARC GENERIC kernel in ELF format.
-				This is the kernel installed by the
-				install script.
-
-		bsd.rd		ARC RAMDISK kernel. This is the
-				kernel that should be booted when
-				installing OpenBSD.
+OpenBSDrd
 
 		bsd.ecoff	ARC GENERIC kernel in ECOFF format.
 				This kernel may be used to boot a
 				system from a MSDOS disk.
 
+OpenBSDdistsets
+
 The ARC ramdisk image is a bootable kernel+rootimage. This kernel is used
 when a system is installed for the first time. The file is in ECOFF format.
 
-The OpenBSD/arc binary distribution sets contain the binaries which
-comprise the OpenBSD 2.3 release for ARC systems. There are seven binary
-distribution sets.  The binary distribution sets can be found in
-the "arc" subdirectory of the OpenBSD 2.3 distribution tree,
-and are as follows:
-
-	base23	The OpenBSD/arc 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.
-		[ 14.0M gzipped, 47.4M uncompressed ]
-
-	comp23	The OpenBSD/arc Compiler tools.  All of the tools
-		relating to C, C++, and FORTRAN (yes, there are two!).
-		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.
-		[ 13.1M gzipped, 51.9M 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.8M gzipped, 7.1M 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.9M uncompressed ]
-
-	text23	This set includes OpenBSD's text processing tools,
-		including groff, all related programs, and their
-		manual pages.
-		[ 958K gzipped, 4.0M 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.
+DistributionDescription
+
+OpenBSDbase(14.0M,47.4M)
+
+OpenBSDcomp(13.1M,51.9M)
+
+OpenBSDetc(92K,490K)
+
+OpenBSDgame(2.8M,7.1M)
+
+OpenBSDman(2.4M,9.2M)
+
+OpenBSDmisc(1.7M,5.9M)
+
+OpenBSDtext(958K,4.0M)
+
+OpenBSDxbase
+
+OpenBSDxfont
+
+OpenBSDxserv
 
diff --git a/distrib/notes/arc/hardware b/distrib/notes/arc/hardware
index 78db879cf07..19fa58be935 100644
--- a/distrib/notes/arc/hardware
+++ b/distrib/notes/arc/hardware
@@ -1,9 +1,9 @@
-OpenBSD/arc 2.3 runs on the following classes of machines:
+OpenBSD/arc OSREV runs on the following classes of machines:
 	- Acer PICA61 (RISC-PC) Systems.
 	- Deskstation rPC44.
 	- Deskstation Tyne.
 
-OpenBSD/pmax 2.3 does *not* (yet) run on these machines:
+OpenBSD/pmax OSREV does *not* (yet) run on these machines:
 	- Mips Magnum
 	- Olivetti systems.
 	- SNI RMxxx machines.
@@ -13,7 +13,7 @@ The minimal configuration requires 8M of RAM and ~60M of disk space.
 To install the entire system requires ~150M of disk space, and to run
 X or compile the system, 32Mb of RAM and ~1G of disk is recommended.
 
-Supported devices include:
+Supported devices {:-include-:}:
 	graphics:
 		built-in S3 VGA graphics adapter on PICA.
 		Standard VGA graphics adapter on rPC44 and Tyne.
diff --git a/distrib/notes/arc/install b/distrib/notes/arc/install
index dbf94276ba1..c0710ef27f6 100644
--- a/distrib/notes/arc/install
+++ b/distrib/notes/arc/install
@@ -1,5 +1,4 @@
-Installing OpenBSD is a relatively complex process, but if you have
-this document in hand it shouldn't be too much trouble.
+OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
 in terms of preliminary setup is to use the OpenBSD ramdisk kernel that
@@ -22,7 +21,7 @@ following string at the "Run a program" prompt:
 to boot from an existing MSDOS FAT partition to which the ramdisk kernel
 have been copied. Or from the CD-ROM:
 
-	CD:\2.3\arc\bsd.rd
+	CD:\OSREV\arc\bsd.rd
 
 Exact input to describe the device path varies. Consult your ARC-Bios manual
 for more information about the particular system.
@@ -82,17 +81,20 @@ So to boot the system to multiuser mode set:
 
 	OSLOADOPTIONS=Na
 
+OpenBSDFTPInstall
 
-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.
+OpenBSDHTTPInstall
 
-Some of the files in the OpenBSD 2.3 distribution might need to be
-tailored for your site.  In particular, the /etc/sendmail.cf file will
-almost definitely need to be adjusted, and other files in /etc will
-probably need to be modified.  If you are unfamiliar with UN*X-like
-system administration, it's recommended that you buy a book that
-discusses it.
+OpenBSDTAPEInstall
 
+OpenBSDCDROMInstall
+
+OpenBSDNFSInstall
+
+OpenBSDDISKInstall({:-"wdN" or -:},,{:- or MS-DOS-:})
+
+OpenBSDCommonFS
+
+OpenBSDCommonURL
+
+OpenBSDCongratulations
diff --git a/distrib/notes/arc/whatis b/distrib/notes/arc/whatis
index 66189f0a4a5..1f4c819a713 100644
--- a/distrib/notes/arc/whatis
+++ b/distrib/notes/arc/whatis
@@ -1,3 +1,3 @@
-OpenBSD 2.3 is the first release of OpenBSD for MIPS R4K ARC Class
+OpenBSD OSREV is the first release of OpenBSD for MIPS R4K ARC Class
 systems. This release has support for R4000PC, R4400PC, R4600PC and
 R4700PC processors.
diff --git a/distrib/notes/atari/contents b/distrib/notes/atari/contents
index 493cc1c4179..93312bc94a2 100644
--- a/distrib/notes/atari/contents
+++ b/distrib/notes/atari/contents
@@ -1,9 +1,4 @@
-The Atari-specific portion of the OpenBSD 2.3 release is found in the
-"atari" subdirectory of the distribution.  That subdirectory is laid
-out as follows:
-
-.../2.3/atari/
-		INSTALL.atari	This file.
+TopPart
 
 		bins/		atari binary distribution sets;
 				see below.
@@ -17,7 +12,7 @@ out as follows:
 				installation section, below.
 
 There are three atari floppy images to be found in the "atari/floppies"
-subdirectory of the OpenBSD 2.3 distribution.  One of them is a
+subdirectory of the OpenBSD OSREV distribution.  One of them is a
 bootable TOS kernel floppy and the other two are installation floppy's.
 They are described in more detail below.  There are gzipped versions
 of each available, for easier downloading.  (The gzipped version
@@ -29,7 +24,7 @@ Bootable Kernel floppy:
 	and the GENERIC kernel.  It is setup so that you can insert it
 	into your floppy drive, and start the programs from GEM.
 
-	This floppy is named boot-23.fs
+	This floppy is named boot-OSrev.fs
 
 Installation floppy:
 
@@ -42,66 +37,27 @@ Installation floppy:
 	file system or ftp.  You can also load distribution sets from
 	a SCSI tape or from one of your existing TOS partitions.
 
-	This floppy's are named "inst-23.fs.1" and "inst-23.fs.2".
-
-The OpenBSD/atari binary distribution sets contain the binaries which
-comprise the OpenBSD 2.3 release for the atari.  There are seven binary
-distribution sets, and the "security" distribution set.  The binary
-distribution sets can be found in subdirectories of the "atari/bins"
-subdirectory of the OpenBSD 2.3 distribution tree, and are as follows:
-
-	base23	The OpenBSD/atari 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.
-		[ 7M gzipped, 19M uncompressed ]
-
-	comp23	The OpenBSD/atari Compiler tools.  All of the tools
-		relating to C, C++, and FORTRAN (yes, there are two!).
-		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.
-		[ 4M gzipped, 12M 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.)
-		[ 50K gzipped, 280K uncompressed ]
-
-	games23	This set includes the games and their manual pages.
-		[ 1M gzipped, 3M 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.
-		[ 730K gzipped, 3M 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.
-		[ 2M gzipped, 6M uncompressed ]
-
-	text23	This set includes OpenBSD's text processing tools,
-		including groff, all related programs, and their
-		manual pages.
-		[ 784K gzipped, 3M 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 floppy's are named "inst-OSrev.fs.1" and "inst-OSrev.fs.2".
+
+DistributionDescription
+
+OpenBSDbase(7M,19M)
+
+OpenBSDcomp(4M,12M)
+
+OpenBSDetc(50K,280K)
+
+OpenBSDgame(1M, 3M)
+
+OpenBSDman(730K,3M)
+
+OpenBSDmisc(2M,6M)
+
+OpenBSDtext(784K,3M)
+
+OpenBSDxbase
+
+OpenBSDxfont
+
+OpenBSDxserv
 
diff --git a/distrib/notes/atari/hardware b/distrib/notes/atari/hardware
index d3bdb3bcc0e..162d6c26a8e 100644
--- a/distrib/notes/atari/hardware
+++ b/distrib/notes/atari/hardware
@@ -1,4 +1,4 @@
-OpenBSD/atari 2.3 runs on a TT030 and a Falcon. Currently an FPU is
+OpenBSD/MACHINE OSREV runs on a TT030 and a Falcon. Currently an FPU is
 required, although this might change in the (near) future. The
 minimum amount of RAM required is 4Mb.
 
@@ -15,7 +15,7 @@ as you will probably want to compile your own kernel. (GENERIC is
 large and bulky to accommodate all people, BOOT is small and might
 not have all the features you want).
 
-Supported devices include:
+Supported devices {:-include-:}:
 	- The built-in SCSI host adapter
 		- Should support most SCSI-drives. The drives that are
 		  currently tested are:
diff --git a/distrib/notes/atari/install b/distrib/notes/atari/install
index 3112ecb1a52..8901ab0f2c1 100644
--- a/distrib/notes/atari/install
+++ b/distrib/notes/atari/install
@@ -1,10 +1,4 @@
-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.
-
-Before you begin, you must have already prepared your hard disk as
-detailed in the section on preparing your system for install.
+OpenBSDInstallPrelude
 
 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,
diff --git a/distrib/notes/hp300/contents b/distrib/notes/hp300/contents
index f18fc7d9a3f..4d151568985 100644
--- a/distrib/notes/hp300/contents
+++ b/distrib/notes/hp300/contents
@@ -1,24 +1,13 @@
-The hp300-specific portion of the OpenBSD 2.3 release is found in the
-"hp300" subdirectory of the distribution.  That subdirectory is laid
-out as follows:
+TopPart
 
-.../2.3/hp300/
-		INSTALL.hp300	Installation notes; this file.
+OpenBSDdistsets
 
-		CKSUM		Output of the cksum(1) and md5(1) programs
-		MD5		usable for verification of the correctness
-				of downloaded files.
-
-		*.tar.gz	hp300 binary distribution sets;
-				see below.
-
-		bsd		A stock GENERIC kernel.
+OpenBSDbsd
 
 		bsd.dl		A GENERIC kernel without any support for
 				disk devices.
 
-		bsd.rd		A compressed RAMDISK kernel; the embedded
-				filesystem contains the installation tools.
+OpenBSDrd
 
 		SYS_UBOOT	Unified boot file, used for booting from
 				the network.
@@ -29,62 +18,25 @@ out as follows:
 		uboot.raw	Raw boot file, used internally for booting
 				from the CDROM.
 
-The OpenBSD/hp300 binary distribution sets contain the binaries which
-comprise the OpenBSD 2.3 release for the hp300.  There are seven binary
-distribution tar sets.  They may be found in the top of the "hp300"
-subdirectory of the OpenBSD 2.3 distribution tree, and are as follows:
-
-	base23	The OpenBSD/hp300 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, 34.0M uncompressed ]
-
-	comp23	The OpenBSD/hp300 Compiler tools.  All of the tools
-		relating to C and C++.  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.5M 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.)
-		[ 94K gzipped, 500K 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.5M 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.
-		[ 947K 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.
+DistributionDescription
+
+OpenBSDbase(11.2M,34.0M)
+
+OpenBSDcomp(7.0M,23.5M)
+
+OpenBSDetc(94K,500K)
+
+OpenBSDgame(2.7M,6.7M)
+
+OpenBSDman(2.5M,9.2M)
+
+OpenBSDmisc(1.7M,5.8M)
+
+OpenBSDtext(947K,3.5M)
+
+OpenBSDxbase
+
+OpenBSDxfont
+
+OpenBSDxserv
 
diff --git a/distrib/notes/hp300/hardware b/distrib/notes/hp300/hardware
index 049ca80bf99..85310901741 100644
--- a/distrib/notes/hp300/hardware
+++ b/distrib/notes/hp300/hardware
@@ -1,4 +1,4 @@
-OpenBSD/hp300 2.3 will run on most HP 9000/300- and 400-series machines.
+OpenBSD/MACHINE OSREV will run on most HP 9000/300- and 400-series machines.
 The lowest amount of RAM that has ever been tested is 7.5M, though it
 may run with less.  Certainly, if you wish to run X, more RAM is
 recommended.
diff --git a/distrib/notes/hp300/install b/distrib/notes/hp300/install
index 555f42c692b..53ff817da1d 100644
--- a/distrib/notes/hp300/install
+++ b/distrib/notes/hp300/install
@@ -106,7 +106,7 @@ process 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
@@ -132,207 +132,20 @@ process again from scratch.
 	installation program, either as tar images or as gzipped tar
 	images.
 
-	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 active mode ftp?  By default,
-		       ftp will attempt to use passive mode and fall
-		       back to an active connection if the server does
-		       not support passive mode.  You only need to enable
-		       this option if you are connecting to a buggy ftp
-		       daemon that implements passive ftp incorrectly.
-		       Note that you will not be asked about active
-		       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/hp300
-		       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.
+OpenBSDFTPInstall
 
-		For instructions on how to complete the installation via
-		ftp, see the section named "Common URL installations" below.
+OpenBSDHTTPInstall
 
-	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.
+OpenBSDTAPEInstall
 
-		For instructions on how to complete the installation via
-		http, see the section named "Common URL installations" below.
+OpenBSDCDROMInstall
 
-	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.
+OpenBSDNFSInstall
 
-		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).
+OpenBSDDISKInstall({:-"hdN" or -:},{:-only -:})
 
-		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.
+OpenBSDCommonFS
 
-		The install program will not automatically detect whether
-		an image has been compressed, so it will ask for that
-		information before starting the extraction.
+OpenBSDCommonURL
 
-	To install from CD-ROM:
-		When installing from a CD-ROM, you will be asked which
-		device holds the distribution sets.  For the hp300, this
-		will show up as a normal scsi device, lile "sd4" for a
-		CD-ROM at SCSI id 4.  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
-		hp300 this is "2.3/hp300".
-
-		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 "hdN" or "sdN" 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
-		only install from partitions that use the fast file system
-		(ffs).
-
-		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.
-
-	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.
-		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.  You may also use wildcards in place of
-		a file name, eg `*.tar.gz' or even `base*|comp*'.  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 extract file sets.  Assuming you
-		acquiesce, the files will begin to extract.  If not, you
-		will be given the option of installing sets via one of
-		the other install methods.
-
-	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.  You may also
-		use wildcards in place of a file name, eg `*.tar.gz' or
-		even `base*|comp*'.  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.
-
-Some of the files in the OpenBSD 2.3 distribution might need to be
-tailored for your site.  In particular, the /etc/sendmail.cf file will
-almost definitely need to be adjusted, and other files in /etc will
-probably need to be modified, as well.  If you are unfamiliar with
-UN*X-like system administration, it's recommended that you buy a book
-that discusses it.
+OpenBSDCongratulations
diff --git a/distrib/notes/hp300/prep b/distrib/notes/hp300/prep
index 7ce2e9dad40..ed10cf2b871 100644
--- a/distrib/notes/hp300/prep
+++ b/distrib/notes/hp300/prep
@@ -27,7 +27,7 @@ NOTE:  BOOTING SYS_UBOOT VIA THE NETWORK IS ONLY POSSIBLE IF YOUR BOOTROM
 IS `REV. C' OR LATER.
 
 In order to complete this process, you will need the following from the
-`2.3/hp300' directory of the distribution:
+`OSREV/hp300' directory of the distribution:
 
 	SYS_UBOOT	The unified boot block file.
 
diff --git a/distrib/notes/hp300/xfer b/distrib/notes/hp300/xfer
index b8f641f8765..1f57b451390 100644
--- a/distrib/notes/hp300/xfer
+++ b/distrib/notes/hp300/xfer
@@ -27,14 +27,14 @@ following:
 	(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 "base23"
-	and "etc23" distributions on tape (in order to do the absolute
+	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 .../2.3		# the top of the tree
+		cd .../OSREV		# the top of the tree
 		cd hp300
-		tar cf <tape_device> base23.tar.gz etc23.tar.gz
+		tar cf <tape_device> base{:--:}OSrev.tar.gz etc{:--:}OSrev.tar.gz
 
 	(Note that you still need to fill in "<tape_device>" in the
 	example.)
@@ -84,7 +84,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" set somewhere in your file system.  If you wish,
+	"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.
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index 8022ef97437..5d9c0634d31 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -1,108 +1,44 @@
-The i386-specific portion of the OpenBSD 2.3 release is found in the
-"i386" subdirectory of the distribution.  That subdirectory is laid
-out as follows:
+TopPart
 
-.../2.3/i386/
-		INSTALL.i386	Installation notes; this file.
+OpenBSDfloppy
 
-		CKSUM		Output of the cksum(1) and md5(1) programs
-		MD5		usable for verification of the correctness
-				of downloaded files.
+OpenBSDdistsets
 
-		floppy23.fs	The i386 boot and installation
-				floppy; see below.
-
-		*.tar.gz	i386 binary distribution sets;
-				see below.
-
-		bsd		A stock GENERIC i386 kernel which
-				will be installed on your system
-				during the install.
+OpenBSDbsd
 
 As well you may be interested in
 
-.../2.3/tools/
+.../OSREV/tools/
 		miscellaneous i386 installation utilities like
 		rawrite.exe, gzip.exe, and pfdisk.exe; see
 		installation section, below.
 
 
-In summary, there is one i386 floppy image called "floppy23.fs" (which
-you can copy to a floppy using rawrite.exe or `dd'; as described later
-in this document).  This is a bootable install floppy which can be
-used both to install and to upgrade OpenBSD to the current version.
-It is also useful for maintenance and disaster recovery.  In addition,
+OpenBSDfloppydesc({:-In addition,
 the "tools/" directory contains some utilities that might be useful
-for the installation.
-
-Bootable installation/upgrade floppy:
-
-	This disk contains a file system, is bootable, and has
-	enough utilities on board to prepare your hard disk drive
-	for OpenBSD and to install the OpenBSD distribution.
-
-	It also holds the utilities needed in order to upgrade a
-	system to the current version of OpenBSD.
-
-The OpenBSD/i386 binary distribution sets contain the binaries which
-comprise the OpenBSD 2.3 release for the i386.  There are seven binary
-distribution sets.  The binary distribution sets can be found in
-the "i386" subdirectory of the OpenBSD 2.3 distribution tree,
-and are as follows:
-
-	base23	The OpenBSD/i386 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.9M gzipped, 33.3M uncompressed ]
-
-	comp23	The OpenBSD/i386 Compiler tools.  All of the tools
-		relating to C, C++, and FORTRAN (yes, there are two!).
-		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.3M gzipped, 23.0M 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.)
-		[ 93K gzipped, 490K uncompressed ]
-
-	game23	This set includes the games and their manual pages.
-		[ 2.7M gzipped, 6.4M 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.5M gzipped, 9.4M 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.
-		[ 944K gzipped, 3.3M 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.
-
-	xlink23 This set includes the X server link kit.
+for the installation.-:})
+
+DistributionDescription
+
+OpenBSDbase(11.9M,33.3M)
+
+OpenBSDcomp(7.3M,23.0M)
+
+OpenBSDetc(93K,490K)
+
+OpenBSDgame(2.7M,6.4M)
+
+OpenBSDman(2.5M,9.4M)
+
+OpenBSDmisc(1.7M,5.8M)
+
+OpenBSDtext(944K,3.3M)
+
+OpenBSDxbase
+
+OpenBSDxfont
+
+OpenBSDxserv
+
+OpenBSDxlink
+
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index 0b98e23b648..107c6adbe4f 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -1,4 +1,4 @@
-OpenBSD/i386 2.3 runs on ISA (AT-Bus), EISA, PCI, and VL-bus systems
+OpenBSD/MACHINE OSREV runs on ISA (AT-Bus), EISA, PCI, and VL-bus systems
 with 386-family processors, with or without math coprocessors.  It
 does NOT support MCA systems, such as some IBM PS/2 systems.  The
 minimal configuration is said to require 4M of RAM and 50M of disk space,
@@ -9,7 +9,7 @@ actually allow you to run X and/or compile, but it won't be speedy.
 Note that until you have around 16M of RAM, getting more RAM is more
 important than getting a faster CPU.)
 
-Supported devices include:
+Supported devices {:-include-:}:
 	Floppy controllers.
 	MFM, ESDI, IDE, and RLL hard disk controllers.
 	SCSI host adapters:
@@ -105,7 +105,7 @@ Supported devices include:
 	Miscellaneous:
 		OPTi(82C929) chipset for multi-interface CD-ROM, and
 			sound ISA cards.
-		PCI-PCI bridges and cards which include them, such as
+		PCI-PCI bridges and cards which {:-include-:} them, such as
 			the AHA-394x SCSI host adapter and some
 			DC21x4x-based multi-Ethernet cards.
 		APM power management.
@@ -315,7 +315,7 @@ Right-click on the "My Computer" Icon, select Properties, select the
 Device Manager tab, and double click on PCMCIA Socket, then on the Bridge
 that is listed under this heading. Select Properties at the bottom of
 the window, and click on Resources. Finally you will see an address range,
-in Hex. On my Dell Lattitude LM, for example, the range was FCFC-FCFF.
+in Hex. On my Dell Latitude LM, for example, the range was FCFC-FCFF.
 
 If you don't have Windows '95 on a hard disk, there are several possibilities:
 1) But you do have Windows'95 setup floppies? Then look through them for
@@ -350,7 +350,7 @@ Follow the normal steps for building a new kernel documented elsewhere.
 For my system I changed the original pcicmaster0 line as follows:
 
 #pcicmaster0	at isa? port 0x3E0 size 2
-# hack for CL PCIC on Dell Lattitude LM; really on PCI, but...
+#hack for CL PCIC on Dell Lattitude LM; really on PCI, but...
 pcicmaster0	at isa? port 0xFCFC size 4
 
 IRQ's: You probably do NOT have to worry about the IRQ's appearing
diff --git a/distrib/notes/i386/install b/distrib/notes/i386/install
index dfa34526d6b..e7b1b65a394 100644
--- a/distrib/notes/i386/install
+++ b/distrib/notes/i386/install
@@ -1,18 +1,4 @@
-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.
-
-Before you begin, you should know the geometry of your hard disk, i.e.
-the sector size (note that sector sizes other than 512 bytes are not
-currently supported), the number of sectors per track, the number of
-tracks per cylinder (also known as the number of heads), and the
-number of cylinders on the disk.  The OpenBSD kernel will try to
-discover these parameters on its own, and if it can it will print them
-at boot time.  If possible, you should use the parameters it prints.
-(You might not be able to because you're sharing your disk with
-another operating system, or because your disk is old enough that the
-kernel can't figure out its geometry.)
+OpenBSDInstallPrelude
 
 If OpenBSD will be sharing the disk with DOS or another operating
 system, you should have already completed the section of these notes
@@ -24,25 +10,18 @@ should use this geometry for the remainder of the install.  This is
 only necessary if you are sharing the disk with other operating systems
 that use the translated geometry.
 
-You should now be ready to install OpenBSD.
+OpenBSDInstallPart2
 
-The following is a walk-through of the steps you will take while
-getting OpenBSD installed on your hard disk.  If any question has a
-default answer, it will be displayed in brackets ("[]") after the
-question.  If you wish to stop the installation, you may hit Control-C
-at any time, but if you do, you'll have to begin the installation
-process again from scratch.
-
-	Boot your machine using the floppy.fs floppy.  When
+	Boot your machine using the floppy{:--:}OSrev.fs floppy.  When
 	presented with the boot prompt hit return.  If the boot prompt
 	does not appear in a reasonable amount of time, you either
 	have a bad boot floppy or a hardware problem.  Try writing the
-	floppy.fs floppy image to a different disk, and using that.
+	floppy{:--:}OSrev.fs floppy image to a different disk, and using that.
 	If that doesn't work, try booting after disabling your CPU's
 	internal and external caches (if any).  If it still doesn't
 	work, OpenBSD probably can't be run on your hardware.  This can
 	probably be considered a bug, so you might want to report it.
-	If you do, please include as many details about your system
+	If you do, please {:-include-:} as many details about your system
 	configuration as you can.
 
 	It will take a while to load the kernel from the floppy,
@@ -52,16 +31,7 @@ process again from scratch.
 	bad or you are having hardware problems, and should proceed
 	as outlined above.
 
-	You will then be presented with the OpenBSD kernel boot
-	messages.  You will want to read them, to determine your
-	disk's name and geometry.  Its name will be something like
-	"sd0" or "wd0" and the geometry will be printed on a line that
-	begins with its name.  As mentioned above, you will need your
-	disk's geometry when creating OpenBSD's partitions.  You will
-	also need to know the name, to tell the install tools what
-	disk to install on.  If you cannot read the messages as they
-	scroll by, do not worry -- you can get at this information
-	later inside the install program.
+OpenBSDBootMsgs
 
 	While booting, you will probably see several warnings.  You
 	should be warned that no swap space is present, and that
@@ -152,7 +122,7 @@ process 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
@@ -185,206 +155,20 @@ process again from scratch.
 	images.  Note that installation from floppies is 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 active mode ftp?  By default,
-		       ftp will attempt to use passive mode and fall
-		       back to an active connection if the server does
-		       not support passive mode.  You only need to enable
-		       this option if you are connecting to a buggy ftp
-		       daemon that implements passive ftp incorrectly.
-		       Note that you will not be asked about active
-		       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/i386
-		       is almost always correct.
-		    5) The login and password for the ftp account.
-		       You will only be asked for a password for
-		       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
-		i386 this is "2.3/i386".
-
-		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 "wdN" or "sdN" 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 fast
-		file system (ffs) or MS-DOS.
-
-		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.
-		
-	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.
-		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.  You may also use wildcards in place of
-		a file name, eg `*.tar.gz' or even `base*|comp*'.  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 extract file sets.  Assuming you
-		acquiesce, the files will begin to extract.  If not, you
-		will be given the option of installing sets via one of
-		the other install methods.
-
-	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.  You may also
-		use wildcards in place of a file name, eg `*.tar.gz' or
-		even `base*|comp*'.  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", "etc23", and "bsd" 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.
-
-Some of the files in the OpenBSD 2.3 distribution might need to be
-tailored for your site.  In particular, the /etc/sendmail.cf file will
-almost definitely need to be adjusted, and other files in /etc will
-probably need to be modified, as well.  If you are unfamiliar with
-UN*X-like system administration, it's recommended that you buy a book
-that discusses it.
+OpenBSDFTPInstall
+
+OpenBSDHTTPInstall
+
+OpenBSDTAPEInstall
+
+OpenBSDCDROMInstall
+
+OpenBSDNFSInstall
+
+OpenBSDDISKInstall({:-"wdN" or -:},,{:- or MS-DOS-:})
+
+OpenBSDCommonFS
+
+OpenBSDCommonURL
+
+OpenBSDCongratulations
diff --git a/distrib/notes/i386/upgrade b/distrib/notes/i386/upgrade
index 5a2a0c138bc..7627db73e23 100644
--- a/distrib/notes/i386/upgrade
+++ b/distrib/notes/i386/upgrade
@@ -10,8 +10,8 @@ partition ID to 0xA6, you will be able to share the disk with 386BSD,
 FreeBSD or NetBSD. Note that the latter three can NOT easily share the disk
 with each other.
 
-To do the upgrade, you must have the floppy23.fs floppy image on a disk.
-You must also have at least the "base23" and "bsd" binary distribution set
+To do the upgrade, you must have the floppy{:--:}OSrev.fs floppy image on a disk.
+You must also have at least the "base{:--:}OSrev" and "bsd" 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
@@ -27,7 +27,7 @@ operating system's partition, before beginning the upgrade process.
 
   To upgrade your system, follow the following instructions:
 
-	Boot your machine using of the floppy23.fs floppy.  When presented
+	Boot your machine using of the floppy{:--:}OSrev.fs floppy.  When presented
 	with the boot prompt (the "boot>" prompt), hit return.
 
 	While booting, you will probably see several warnings.  You should
@@ -70,7 +70,7 @@ operating system's partition, before beginning the upgrade process.
 	answer affirmatively, the configuration stored on the root file
 	system will be used.  After this you will be given the opportunity
 	to escape to the command shell to do any additional network
-	configuration.  This may include adding or altering routes, if
+	configuration.  This may {:-include-:} adding or altering routes, if
 	needed.
 	
 	At the next point you can edit the fstab, which is used for the
@@ -82,7 +82,7 @@ operating system's partition, before beginning the upgrade process.
 
 	You will be asked if the upgrade sets are already on the mounted
 	file systems.  If you answer with yes, you can type in the path
-	where the sets are stored.  The upgrade then contiues with the
+	where the sets are stored.  The upgrade then continues with the
 	procedure described in the paragraph "Common file system
 	installations" in the install section of this document.
 
@@ -90,16 +90,16 @@ operating system's partition, before beginning the upgrade process.
 	disk, look at the installation section of this document for
 	information on how to go on.  Your options are to install via FTP,
 	via HTTP, via nfs, from tape, from CD-ROM or, again, from local
-	disk.  But remember to not install the "etc23" distribution file!
+	disk.  But remember to not install the "etc{:--:}OSrev" distribution file!
 
-  Your system has now been upgraded to OpenBSD 2.3.
+  Your system has now been upgraded to OpenBSD OSREV.
 
-	After rebooting your machine is a complete OpenBSD 2.3 system.
+	After rebooting 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 distribution,
+	First, you will probably want to get the etc{:--:}OSrev distribution,
 	extract it to a temporary location, 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
diff --git a/distrib/notes/i386/whatis b/distrib/notes/i386/whatis
index f4072e12594..7149543a3ce 100644
--- a/distrib/notes/i386/whatis
+++ b/distrib/notes/i386/whatis
@@ -1,3 +1,3 @@
-For the i386, OpenBSD 2.3 brings greater stability and security.  As a
+For the MACHINE, OpenBSD OSREV brings greater stability and security.  As a
 side effect of the full security audit, many userland programs have
 been significantly cleaned up and debugged.
diff --git a/distrib/notes/i386/xfer b/distrib/notes/i386/xfer
index 33cbe946865..5a69f889e3d 100644
--- a/distrib/notes/i386/xfer
+++ b/distrib/notes/i386/xfer
@@ -13,7 +13,7 @@ a floppy disk (1.44Mb required).
 
 If you are using a UN*X-like system to write the floppy image to
 disk, you should use the "dd" command to copy the file system image
-(floppy23.fs) directly to the raw floppy disks.  It is suggested that
+(floppy{:--:}OSrev.fs) directly to the raw floppy disks.  It is suggested that
 you read the dd(1) manual page or ask your system administrator to
 determine the correct set of arguments to use; it will be slightly
 different from system to system, and a comprehensive list of the
@@ -22,7 +22,7 @@ possibilities is beyond the scope of this document.
 If you are using DOS to write the floppy image to disk, you should
 use the "rawrite" utility, provided in the "i386/inst" directory of
 the OpenBSD distribution.  It will write the file system image
-(floppy23.fs) to a disk.
+(floppy{:--:}OSrev.fs) to a disk.
 
 Note that when installing, the floppy can be write-protected (i.e.
 read-only).
@@ -47,14 +47,14 @@ following:
 	(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 "base23",
-	"etc23", and "bsd" distributions on tape (in order to do the
+	wish to place on the tape.  For instance, to put the "base{:--:}OSrev",
+	"etc{:--:}OSrev", and "bsd" distributions on tape (in order to do the
 	absolute minimum installation to a new disk), you would do the
 	following:
 
-		cd .../2.3		# the top of the tree
-		cd i386/
-		tar cf <tape_device> base23 etc23 bsd
+		cd .../OSREV		# the top of the tree
+		cd MACHINE/
+		tar cf <tape_device> base{:--:}OSrev etc{:--:}OSrev bsd
 
 	(Note that you still need to fill in "<tape_device>" in the
 	example.)
@@ -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" set somewhere in your file system.  If you wish,
+	"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.
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
new file mode 100644
index 00000000000..736dc56d2f9
--- /dev/null
+++ b/distrib/notes/m4.common
@@ -0,0 +1,479 @@
+dnl
+dnl	$OpenBSD: m4.common,v 1.1 1998/05/18 00:33:17 todd Exp $
+dnl
+dnl simulate an include path with a macro 'includeit'.
+define(`includeit',`sinclude('INCLUDE/`$1)sinclude('INCLUDE/../`$1)')dnl
+dnl
+dnl
+dnl If both the 1st and the 2nd argument exist, show the sizes.
+dnl Otherwise, evaluate to NULL.
+dnl
+dnl XXX fix to allow - empty 1st arg, for files uncompressed
+dnl                  - empty 2nd arg, for files where only compressed size is
+dnl                    known (aka pc532)
+dnl
+define(`showsize',`ifelse(X$1,X,,X$2,X,,X,X,{:-
+		[ $1 gzipped, $2 uncompressed ]-:})')dnl
+dnl
+dnl
+dnl  Everybody looks the same on these (or should if they don't)
+dnl
+define(`TopPart',
+`The MACHINE-specific portion of the OpenBSD OSREV release is found in the
+"MACHINE" subdirectory of the distribution.  That subdirectory is laid
+out as follows:
+
+.../OSREV/MACHINE/
+		INSTALL.MACHINE	Installation notes; this file.
+
+		CKSUM		Output of the cksum(1) and md5(1) programs
+		MD5		usable for verification of the correctness
+				of downloaded files.')dnl
+dnl
+dnl 
+dnl XXX Fix this for i386 vs rest 'ten binary' is not right for i386
+define(`DistributionDescription',
+`The OpenBSD/MACHINE binary distribution sets contain the binaries which
+comprise the OpenBSD OSREV release for MACHINE systems.  There are ten binary
+distribution sets.  The binary distribution sets can be found in
+the "MACHINE" subdirectory of the OpenBSD OSREV distribution tree,
+and are as follows:')dnl
+dnl
+dnl
+dnl Change the quote.  There were too many `word' situations that would have
+dnl to have been changed to ``word''.  The quote gets changed to {:- and -:}.
+dnl It can really be anything, but it needs to be unique.
+dnl
+changequote(`{:-',`-:}')dnl
+dnl
+dnl
+dnl Conventions when editing:
+dnl o base`'OSrev is required because if it appears as baseOSrev the defined
+dnl   value OSrev does not get substituted.  Same goes for MACHINE and OSREV,
+dnl   assigned as cmd line parameters to m4 in the Makefile.
+dnl o `include' and `define' is required as include and define are both m4
+dnl   reserved words that evaluate to NULL if not quoted.
+dnl o showsize() must not be on a new line.  It creates it's own new line if
+dnl   there are sizes to display, otherwise, evaluates to NULL
+dnl
+dnl
+dnl OpenBSDbase( compressed size, uncompressed size )
+dnl
+define({:-OpenBSDbase-:},
+{:-	base{:--:}OSrev	The OpenBSD/MACHINE OSREV 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.showsize($1,$2)-:})dnl
+dnl
+dnl
+dnl OpenBSDcomp( compressed size, uncompressed size )
+dnl
+define({:-OpenBSDcomp-:},
+{:-	comp{:--:}OSrev	The OpenBSD/MACHINE Compiler tools.  All of the tools
+		relating to C, C++, and FORTRAN (yes, there are two!) 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.showsize($1,$2)-:})dnl
+dnl
+dnl
+dnl OpenBSDetc( compressed size, uncompressed size )
+dnl
+define({:-OpenBSDetc-:},
+{:-	etc{:--:}OSrev	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.)showsize($1,$2)-:})dnl
+dnl
+dnl
+dnl OpenBSDgame( compressed size, uncompressed size )
+dnl
+define({:-OpenBSDgame-:},
+{:-	game{:--:}OSrev	This set includes the games and their manual pages.showsize($1,$2)-:})dnl
+dnl
+dnl
+dnl OpenBSDman( compressed size, uncompressed size )
+dnl
+define({:-OpenBSDman-:},
+{:-	man{:--:}OSrev	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.showsize($1,$2)-:})dnl
+dnl
+dnl
+dnl OpenBSDmisc( compressed size, uncompressed size )
+dnl
+define({:-OpenBSDmisc-:},
+{:-	misc{:--:}OSrev	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.showsize($1,$2)-:})dnl
+dnl
+dnl
+dnl OpenBSDtext( compressed size, uncompressed size )
+dnl
+define({:-OpenBSDtext-:},
+{:-	text{:--:}OSrev	This set includes OpenBSD's text processing tools,
+		including groff, all related programs, and their
+		manual pages.showsize($1,$2)-:})dnl
+dnl
+dnl
+dnl OpenBSDxbase( compressed size, uncompressed size )
+dnl
+define({:-OpenBSDxbase-:},
+{:-	xbase{:--:}OSrev This set includes the base X distribution.  This includes
+		programs, headers, libraries, configuration files.showsize($1,$2)-:})dnl
+dnl
+dnl
+dnl OpenBSDxfont( compressed size, uncompressed size )
+dnl
+define({:-OpenBSDxfont-:},
+{:-	xfont{:--:}OSrev This set includes all of the X fonts.showsize($1,$2)-:})dnl
+dnl
+dnl
+dnl OpenBSDxserv( compressed size, uncompressed size )
+dnl
+define({:-OpenBSDxserv-:},
+{:-	xserv{:--:}OSrev This set includes all of the X servers.showsize($1,$2)-:})dnl
+dnl
+dnl
+dnl OpenBSDxlink( compressed size, uncompressed size )
+dnl
+define({:-OpenBSDxlink-:},
+{:-	xlink{:--:}OSrev This set includes the X server link kit.showsize($1,$2)-:})dnl
+dnl
+dnl
+dnl floppy stuff
+dnl
+define({:-OpenBSDfloppy-:},
+{:-		floppy{:--:}OSrev.fs	The MACHINE boot and installation
+				floppy; see below.-:})dnl
+dnl
+define({:-OpenBSDfloppydesc-:},
+{:-In summary, there is one MACHINE floppy image called "floppy{:--:}OSrev.fs" (which
+you can copy to a floppy using rawrite.exe or `dd'; as described later
+in this document).  This is a bootable install floppy which can be 
+used both to install and to upgrade OpenBSD to the current version.   
+It is also useful for maintenance and disaster recovery.  $1
+
+Bootable installation/upgrade floppy:
+
+	This disk contains a file system, is bootable, and has   
+	enough utilities on board to prepare your hard disk drive
+	for OpenBSD and to install the OpenBSD distribution.
+
+	It also holds the utilities needed in order to upgrade a
+	system to the current version of OpenBSD.-:})dnl
+dnl
+dnl
+dnl misc
+dnl
+define({:-OpenBSDdistsets-:},
+{:-		*.tar.gz	MACHINE binary distribution sets;
+				see below.-:})dnl
+dnl
+define({:-OpenBSDbsd-:},
+{:-		bsd		A stock GENERIC MACHINE kernel which
+				will be installed on your system
+				during the install.-:})dnl
+dnl
+define({:-OpenBSDrd-:},
+{:-		bsd.rd		A compressed RAMDISK kernel; the embedded
+				filesystem contains the installation tools.
+				Used for simple installation from a pre-
+				existing system.-:})dnl
+dnl
+define({:-OpenBSDminiroot-:},
+{:-		miniroot{:--:}OSrev.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.-:})dnl
+dnl
+dnl
+dnl  Various Install Instructions
+dnl
+define({:-OpenBSDInstallPrelude-:},
+{:-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.
+
+Before you begin, you should know the geometry of your hard disk, i.e.
+the sector size (note that sector sizes other than 512 bytes are not
+currently supported), the number of sectors per track, the number of
+tracks per cylinder (also known as the number of heads), and the
+number of cylinders on the disk.  The OpenBSD kernel will try to
+discover these parameters on its own, and if it can it will print them
+at boot time.  If possible, you should use the parameters it prints.
+(You might not be able to because you're sharing your disk with
+another operating system, or because your disk is old enough that the
+kernel can't figure out its geometry.)-:})dnl
+dnl
+define({:-OpenBSDInstallPart2-:},
+{:-You should now be ready to install OpenBSD.
+
+The following is a walk-through of the steps you will take while
+getting OpenBSD installed on your hard disk.  If any question has a
+default answer, it will be displayed in brackets ("[]") after the  
+question.  If you wish to stop the installation, you may hit Control-C
+at any time, but if you do, you'll have to begin the installation
+process again from scratch.-:})dnl
+dnl
+define({:-OpenBSDBootMsgs-:},
+{:-	Once the kernel has loaded, you will be presented with the
+	OpenBSD kernel boot messages.  You will want to read them
+	to determine your disk's name and geometry.  Its name will
+	be something like "sd0" or "wd0" and the geometry will be
+	printed on a line that begins with its name.  As mentioned
+	above, you will need your disk's geometry when creating
+	OpenBSD partitions.  You will also need to know the device
+	name to tell the install tools what disk to install on. If
+	you cannot read the messages as they scroll by, do not
+	worry -- you can get at this information later inside the
+	install program.-:})dnl
+dnl
+dnl
+define({:-OpenBSDFTPInstall-:},
+{:-	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 active mode ftp?  By default,
+		       ftp will attempt to use passive mode and fall
+		       back to an active connection if the server does
+		       not support passive mode.  You only need to enable
+		       this option if you are connecting to a buggy ftp
+		       daemon that implements passive ftp incorrectly.
+		       Note that you will not be asked about active
+		       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 OSREV 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/OSREV/MACHINE
+		       is almost always correct.
+		    5) The login and password for the ftp account.
+		       You will only be asked for a password for
+		       non-anonymous ftp.
+
+		For instructions on how to complete the installation via
+		ftp, see the section named "Common URL installations" below.-:})dnl
+dnl
+define({:-OpenBSDHTTPInstall-:},
+{:-	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 OSREV 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.-:})dnl
+dnl
+define({:-OpenBSDTAPEInstall-:},
+{:-	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.-:})dnl
+dnl
+define({:-OpenBSDCDROMInstall-:},
+{:-	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
+		MACHINE this is "OSREV/MACHINE".
+
+		For instructions on how to complete the installation from
+		the CD-ROM distribution, see the section named "Common
+		file system installations" below.-:})dnl
+dnl
+define({:-OpenBSDNFSInstall-:},
+{:-	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.-:})dnl
+dnl
+dnl OpenBSDDISKInstall({:-<additional disk> or-:},   <-- $1
+dnl		       {:-only -:},                  <-- $2
+dnl                    {:- or <other fs name>-:})dnl <-- $3
+dnl
+dnl Note the spacing used above.  It is crucial to keep words from running
+dnl together in the actual document.
+dnl
+dnl Arg 1 is optional.
+dnl Choices for args 2 & 3:
+dnl - OpenBSDDISKInstall(,{:-only -:})  
+dnl    (only have 1 fs possible, ffs)
+dnl - OpenBSDDISKInstall(,,{:-or <insert some other filesystem name>-:})
+dnl    (have another fs possible for reading during disk install)
+dnl
+dnl see $1, $2, and $3 below for further usage information.
+dnl
+define({:-OpenBSDDISKInstall-:},
+{:-	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 $1"sdN" 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
+		$2{:--:}install from partitions that has been formatted as the
+		Berkeley fast file system (ffs)$3.
+
+		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.-:})dnl
+dnl
+define({:-OpenBSDCommonFS-:},
+{:-	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.
+		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.  You may also use wildcards in place of
+		a file name, eg `*.tar.gz' or even `base*|comp*'.  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 extract file sets.  Assuming you
+		acquiesce, the files will begin to extract.  If not, you
+		will be given the option of installing sets via one of
+		the other install methods.-:})dnl
+dnl
+define({:-OpenBSDCommonURL-:},
+{:-	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.  You may also
+		use wildcards in place of a file name, eg `*.tar.gz' or
+		even `base*|comp*'.  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 "base{:--:}OSrev", "etc{:--:}OSrev", and "bsd" distribution sets.-:})dnl
+dnl
+define({:-OpenBSDCongratulations-:},
+{:-Congratulations, you have successfully installed OpenBSD OSREV.  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 the first message.  You quit mail by
+entering "q".
+
+Some of the files in the OpenBSD OSREV distribution might need to be
+tailored for your site.  We recommend you run:
+
+	man afterboot
+
+which wilk 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.-:})dnl
diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index 0d58a71c025..1e3be87148c 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -1,29 +1,15 @@
-The mac68k-specific portion of the OpenBSD 2.3 release is found in the
-"mac68k" subdirectory of the distribution.  That subdirectory is laid
-out as follows:
+TopPart
 
-.../2.3/mac68k/
-		INSTALL.mac68k	This file
-
-		CKSUM		Output of the cksum(1) and md5(1) programs
-		MD5		usable for verification of the correctness
-				of downloaded files.
-
-		*.tar.gz	mac68k binary distribution sets;
-				see below.
+OpenBSDdistsets
 
 		bsd-generic*	mac68k kernel binaries.
 				You MUST install one.
 
 		utils/		The mac68k installation utilities for MacOS.
 
-The OpenBSD/mac68k binary distribution sets contain all the binaries which
-comprise the OpenBSD 2.3 release for the mac68k.  There are seven binary
-distribution sets.  The binary distribution sets can be found in
-the "mac68k" subdirectory of the OpenBSD 2.3 distribution tree,
-and are as follows:
+DistributionDescription
 
-	bsd-generic.tar.gz	The OpenBSD/mac68k 2.3 kernel binary.  
+	bsd-generic.tar.gz	The OpenBSD/MACHINE OSREV kernel binary.  
 		You MUST install this file.  It is the kernel that you 
 		need to boot the system.
 		[ 1.4M uncompressed ]
@@ -36,71 +22,27 @@ and are as follows:
 		or bsd-generic.tar.gz.
 		[ 1.4M uncompressed ]
 
-	base23.tar.gz	The OpenBSD/mac68k 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.9M gzipped, 33.7M uncompressed ]
-
-	comp23.tar.gz	The OpenBSD/mac68k Compiler tools.  All of the tools
-		relating to C, C++, and FORTRAN (yes, there are two!).
-		This set includes the system header 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.  It is very almost a must
-		to install this set if one wants an even minimally
-		functional system.
-		[ 7.0M gzipped, 23.5M uncompressed ]
-
-	etc23.tar.gz	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.)
-		[ 93K gzipped, 490K uncompressed ]
-
-	game23.tar.gz	This set includes the BSD games and their manual
-		pages.  It's installation is optional.
-		[ 2.7M gzipped, 6.7M uncompressed ]
-
-	man23.tar.gz	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.  Installation of
-		this set is completely optional but is highly recommended.
-		[ 2.4M gzipped, 9.1M uncompressed ]
-
-	misc23.tar.gz	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 as well as
-		many other sundry system files and programs.  This set
-		is not necessary but will improve the functionality
-		of many system programs.
-		[ 1.7M gzipped, 5.9M uncompressed ]
-
-	text23.tar.gz	This set includes OpenBSD's text processing tools,
-		including groff, all related programs, and their
-		manual pages.  This set is highly recommended as
-		these programs are depended upon for such basic 
-		system functions as reading manual pages.
-		[ 946K 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.
-
-The directory '../2.3/mac68k/utils' contains a number of utilities for the
+OpenBSDbase(11.9M,33.7M)
+
+OpenBSDcomp(7.0M,23.5M)
+
+OpenBSDetc(93K,490K)
+
+OpenBSDgame(2.7M,6.7M)
+
+OpenBSDman(2.4M,9.1M)
+
+OpenBSDmisc(1.7M,5.9M)
+
+OpenBSDtext(946K,3.5M)
+
+OpenBSDxbase
+
+OpenBSDxfont
+
+OpenBSDxserv
+
+The directory '../OSREV/mac68k/utils' contains a number of utilities for the
 MacOS to aid the installation and configuration of OpenBSD.  The files in
 this directory are as follows:
 
diff --git a/distrib/notes/mac68k/hardware b/distrib/notes/mac68k/hardware
index f653db726ea..9bffc91bd18 100644
--- a/distrib/notes/mac68k/hardware
+++ b/distrib/notes/mac68k/hardware
@@ -1,14 +1,14 @@
-OpenBSD/mac68k 2.3 runs on several of the older Macintosh computers.
+OpenBSD/MACHINE OSREV runs on several of the older Macintosh computers.
 6MB of RAM should be sufficient to boot and the system can probably
 be squeezed onto a 60MB hard disk by leaving off a package or two.
 To actually do much compiling or anything more interesting than
 booting, at least 8MB of RAM and more disk space is recommended.
-About 80MB will be necessary to install all of the OpenBSD 2.3 binary
+About 80MB will be necessary to install all of the OpenBSD OSREV binary
 distribution (note that this does not count swap space!).  Much more
 disk space is required to install the source and objects as well (about
 another 105MB).
 
-OpenBSD/mac68k 2.3 now runs on most 680x0 MacIntosh's.  Specifically, it
+OpenBSD/mac68k OSREV now runs on most 680x0 MacIntosh's.  Specifically, it
 should work on:
 	68020 with 68851 PMMU and 68881 FPU
 	68030 with 68882 FPU (most Macs have this)
@@ -28,7 +28,7 @@ machine.
 	PB165c
 
 
-Supported devices on all of the above systems include:
+Supported devices on all of the above systems {:-include-:}:
 	Internal SCSI bus and most SCSI tapes, hard drives, and CD-ROMs
 	Internal sound--enough to beep on some machines, anyway
 	Most NuBus video cards (there have been some
diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install
index a64c1e616d0..5e775f5981a 100644
--- a/distrib/notes/mac68k/install
+++ b/distrib/notes/mac68k/install
@@ -76,7 +76,7 @@ If you are installing onto a single root partition, proceed to the
 Installation of base files:
 
 	Select the "Install" menu item from the "File" menu and install
-	base23.tar.gz, bsd-generic.tar.gz, comp23.tar.gz, and any other 
+	base{:--:}OSrev.tar.gz, bsd-generic.tar.gz, comp{:--:}OSrev.tar.gz, and any other 
 	packages you wish to install at this time (see the contents section 
 	for information about what's in each package).  The installer will
 	print out the filename of each file as it is installed and will
@@ -103,19 +103,5 @@ option in the "File" menu, then quit the application and restart.  Due
 to a long-standing bug, the preferences will not be saved unless you
 quit.
 
-If the system comes up, 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.
-
-Some of the files in the OpenBSD 2.3 distribution might need to be
-tailored for your site.  In particular, the /etc/sendmail.cf file will
-almost definitely need to be adjusted, and other files in /etc will
-probably need to be modified, as well.  If you are unfamiliar with
-UN*X-like system administration, it's recommended that you buy a book
-that discusses it.  Also, a useful resource in getting to know your new
-system is the *BSD FAQ which is available from numerous sights on the
-Internet.
+OpenBSDCongratulations
 
diff --git a/distrib/notes/mac68k/upgrade b/distrib/notes/mac68k/upgrade
index bceb042f6d8..e71fea4ba1a 100644
--- a/distrib/notes/mac68k/upgrade
+++ b/distrib/notes/mac68k/upgrade
@@ -1,11 +1,11 @@
-To upgrade to OpenBSD 2.3 from a previous version, you should follow the
+To upgrade to OpenBSD OSREV from a previous version, you should follow the
 instructions on installing the system beginning with using the MacBSD
 Install Utility.  All you need do is copy each of the distribution sets in
 over your current system from the MacOS.
 
-However, you should not copy the etc23.tar.gz file into the system.
+However, you should not copy the etc{:--:}OSrev.tar.gz file into the system.
 Instead, download it while running OpenBSD and put it in /tmp or some other
-harmless place and unpack it with a command like 'tar zxvf etc23.tar.gz'.
+harmless place and unpack it with a command like 'tar zxvf etc{:--:}OSrev.tar.gz'.
 You will then have an etc directory with current system configuration files
 in it.  Use this to carefully upgrade your files in the running /etc and
 reboot the system.  Also, it is highly recommended that when upgrading your
diff --git a/distrib/notes/mac68k/whatis b/distrib/notes/mac68k/whatis
index 598492e805d..8ddc0b1452c 100644
--- a/distrib/notes/mac68k/whatis
+++ b/distrib/notes/mac68k/whatis
@@ -1,4 +1,4 @@
-OpenBSD 2.3 is the third release of OpenBSD for Macintosh
+OpenBSD OSREV is the third release of OpenBSD for Macintosh
 computers.  As always, there is much to be done on this 
 architecture, and help is very much appreciated.  However,
 a wide variety of hardware and software is completely
diff --git a/distrib/notes/mac68k/xfer b/distrib/notes/mac68k/xfer
index f0f57bca197..59208c2a7f0 100644
--- a/distrib/notes/mac68k/xfer
+++ b/distrib/notes/mac68k/xfer
@@ -1,7 +1,7 @@
 Installation is really only supported from the local Macintosh
 hard drive or from an AppleShare volume.  This means that you'll
 need at least enough room for the largest file that you will have
-to install.  This is the 6.2M base23 file.  There has been talk
+to install.  This is the 6.2M base{:--:}OSrev file.  There has been talk
 of allowing an install from split files.  If you have the time,
 desire, and knowledge, please feel free to add that functionality.
 
diff --git a/distrib/notes/mirrors b/distrib/notes/mirrors
index 9cb06334330..f05716e17e7 100644
--- a/distrib/notes/mirrors
+++ b/distrib/notes/mirrors
@@ -84,6 +84,6 @@ ftp://obsd.compmore.net/pub/OpenBSD ==
 
 ftp://ftp.styx.org/pub/OpenBSD
 
-As well, the file ftp://ftp.openbsd.org/pub/OpenBSD/2.3/ftplist
+As well, the file ftp://ftp.openbsd.org/pub/OpenBSD/OSREV/ftplist
 contains a list which is continually updated.  If you wish to become a
 distribution site for OpenBSD, contact deraadt@cvs.openbsd.org.
diff --git a/distrib/notes/mvme68k/contents b/distrib/notes/mvme68k/contents
index 677e983bb2a..74b2bff20f4 100644
--- a/distrib/notes/mvme68k/contents
+++ b/distrib/notes/mvme68k/contents
@@ -1,82 +1,30 @@
-The mvme68k-specific portion of the OpenBSD 2.3 release is found in the
-"mvme68k" subdirectory of the distribution.  That subdirectory is laid
-out as follows:
+TopPart
 
-.../2.3/mvme68k/
-		INSTALL.mvme68k	this document
+OpenBSDdistsets
 
-		CKSUM		Output of the cksum(1) and md5(1) programs
-		MD5		usable for verification of the correctness
-				of downloadable files.
+OpenBSDbsd
 
-		*.tar.gz	mvme68k binary distribution sets;
-				see below.
+OpenBSDrd
 
-		bsd		A stock GENERIC mvme68k kernel which will
-				be installed on your system
-				during the install.
+DistributionDescription
 
-		bsd.rd		A ramdisk OpenBSD kernel used for simple
-				installation.
+OpenBSDbase(11.2M,33.9M)
 
-The OpenBSD/mvme68k binary distribution sets contain the binaries which
-comprise the OpenBSD 2.3 release for the mvme68k.  There are seven binary
-distribution sets.  The binary distribution sets can be found in
-the "mvme68k" subdirectory of the OpenBSD 2.3 distribution tree,
-and are as follows:
+OpenBSDcomp(7.0M,23.5M)
 
-	base23	The OpenBSD/mvme68k 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 ]
+OpenBSDetc(92K,490K)
 
-	comp23	The OpenBSD/mvme68k Compiler tools.  All of the tools
-		relating to C, C++, and FORTRAN.
-		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.5M uncompressed ]
+OpenBSDgame(2.7M,6.7M)
 
-	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 ]
+OpenBSDman(2.4M,9.2M)
 
-	games23	This set includes the games and their manual pages.
-		[ 2.7M gzipped, 6.7M uncompressed ]
+OpenBSDmisc(1.7M,5.9M)
 
-	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 ]
+OpenBSDtext(946K,3.5M)
 
-	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.9M uncompressed ]
+OpenBSDxbase
 
-	text23	This set includes OpenBSD's text processing tools,
-		including groff, all related programs, and their
-		manual pages.
-		[ 946K gzipped, 3.5M uncompressed ]
+OpenBSDxfont
 
-	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.
+OpenBSDxserv
 
diff --git a/distrib/notes/mvme68k/hardware b/distrib/notes/mvme68k/hardware
index 829d655e77e..652f8fac005 100644
--- a/distrib/notes/mvme68k/hardware
+++ b/distrib/notes/mvme68k/hardware
@@ -1,4 +1,4 @@
-OpenBSD/mvme68k 2.3 runs on the following classes of machines:
+OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- MVME147 - Motorola with 68030 and 68881
 	- MVME162 - Motorola with 68040
 	- MVME167 - Motorola with 68040
@@ -10,7 +10,7 @@ RAM feels like Solaris with 4M of RAM.) Note that until you have
 around 16M of RAM, getting more RAM is more important than getting a
 faster CPU.)
 
-Supported devices include:
+Supported devices {:-include-:}:
 
 MVME147:
 	serial ports: 
diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install
index a77675c196d..2075f28abd9 100644
--- a/distrib/notes/mvme68k/install
+++ b/distrib/notes/mvme68k/install
@@ -180,7 +180,7 @@ The `(Cyl. x - y)' info that appears after the hash (`#') character is
 treated as a comment and need not be filled in when altering partitions.
 
 Special note: the line containing `8 partitions:' is best left alone,
-even if you define less then eight partitions. If this line displays
+even if you {:-define-:} less then eight partitions. If this line displays
 a different number and the program complains about it (after you leave
 the editor), then try setting it to `8 partitions:'.
 
diff --git a/distrib/notes/packages b/distrib/notes/packages
index 83a967a96ed..878e70a51ab 100644
--- a/distrib/notes/packages
+++ b/distrib/notes/packages
@@ -76,7 +76,7 @@ Installing applications from the CD-ROM package collection:
 Installing applications from the ftp.openbsd.org package collection:
 
 	The above packages, and others, have been placed on
-	ftp.openbsd.org in the directory pub/OpenBSD/2.3/packages/<arch>/
+	ftp.openbsd.org in the directory pub/OpenBSD/OSREV/packages/<arch>/
 	where <arch> is the supported hardware architecture.  You may
 	want to peruse the directory for your architecture to see what
 	packages are available.  The packages are also on the OpenBSD FTP
@@ -92,7 +92,7 @@ Installing applications from the ftp.openbsd.org package collection:
 
     $ su
     Password: <enter your root password>
-    # pkg_add ftp://ftp.openbsd.org/pub/OpenBSD/2.3/packages/i386/emacs-20.2.tgz
+    {:-#-:} pkg_add ftp://ftp.openbsd.org/pub/OpenBSD/{:--:}OSREV/packages/MACHINE/emacs-20.2.tgz
 
 	Note: there are both USA and INTERNATIONAL versions of ssh and
 	pgp on the ftp server.  Be sure to grab the correct version.
@@ -100,7 +100,7 @@ Installing applications from the ftp.openbsd.org package collection:
 	RSAREF, a legal requirement for use within the United States due
 	to patent issues.
 
-	Packages available include:
+	Packages available {:-include-:}:
 
 		bash-2.01.1.tgz               pine-3.96.tgz
 		emacs-20.2.tgz                screen-3.7.4.tgz    
diff --git a/distrib/notes/pc532/contents b/distrib/notes/pc532/contents
index 7441320e24f..fe352c9c7f1 100644
--- a/distrib/notes/pc532/contents
+++ b/distrib/notes/pc532/contents
@@ -1,90 +1,35 @@
-The pc532-specific portion of the OpenBSD 2.3 release is found in the
-"pc532" subdirectory of the distribution.  That subdirectory contains
-the files as follows:
+TopPart
 
-.../2.3/pc532/
+OpenBSDfloppy
 
-	INSTALL.pc532		Installation notes; this file.
+OpenBSDdistsets
 
-	CKSUM			Output of the cksum(1) and md5(1) programs
-	MD5			usable for verification of the correctness
-				of downloaded files.
+	download.c.gz		Source for a pc532 ROM compat download pgm
 
-	floppy23.fs		The pc532 boot and installation floppy;
-				see below.
+	bsd.default.gz		Upgrade kernel
 
-	*.tar.gz		pc532 binary distribution sets;
-				see below.
 
-	download.c.gz		Source for a pc532 ROM compat download pgm
+DistributionDescription
 
-	bsd.default.gz		Upgrade kernel
+OpenBSDbase(6.8M,?)
+
+OpenBSDcomp(4.7M,?)
+
+OpenBSDetc(63K,?)
+
+OpenBSDgame(2.8M,?)
+
+OpenBSDman(0.8M,?)
+
+OpenBSDmisc(1.9M,?)
+
+OpenBSDtext(0.8M,?)
+
+OpenBSDxbase
 
+OpenBSDxfont
 
-The OpenBSD/pc532 binary distribution sets contain the binaries which
-comprise the OpenBSD 2.3 release for the pc532.  There are seven binary
-distribution sets.  The binary distribution sets can be found in
-the "pc532" subdirectory of the OpenBSD 2.3 distribution tree,
-and are as follows:
-
-	base23
-		The OpenBSD/pc532 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
-		excludes everything described below.
-		[ 6.8M gzipped ]
-
-	comp23
-		The OpenBSD/pc532 Compiler tools.  All of the tools
-		relating to C, C++, and FORTRAN (yes, there are two!).
-		This set includes the system include files
-		(/usr/include), the linker, the compiler tool chain,
-		and the various system libraries.  This set also includes
-		the manual pages for all the utilities it contains, as well
-		as the system call and library manual pages.
-		[ 4.7M gzipped ]
-
-	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.)
-		[ 63K gzipped ]
-
-	games23
-		This set includes the games and their manual pages.
-		[ 2.8M gzipped ]
-
-	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.
-		[ 0.8M gzipped ]
-
-	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.9M gzipped ]
-
-	text23
-		This set includes OpenBSD's text processing tools,
-		including groff, all related programs, and their
-		manual pages.
-		[ 0.8M gzipped ]
-
-	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.
+OpenBSDxserv
 
 The initial installation process on a pc532 without OpenBSD/pc532
 is supported by the following files:
@@ -92,7 +37,7 @@ is supported by the following files:
 	Initial file system used via SCSI floppy or downloaded into 
 	memory:
 
-	inst-23.fs	-- file system containing boot loader 
+	inst-OSrev.fs	-- file system containing boot loader 
 			   and install kernel with 2MB
 			   ram root file system.
 
diff --git a/distrib/notes/pc532/install b/distrib/notes/pc532/install
index 9cf08b35145..4b5229e3760 100644
--- a/distrib/notes/pc532/install
+++ b/distrib/notes/pc532/install
@@ -2,7 +2,7 @@
 your system, see the next section.)
 
 To install OpenBSD/pc532, there are several things you need to know.
-First, OpenBSD "autoconfigs" the scsi devices. inst-20.fs has only
+First, OpenBSD "autoconfigs" the scsi devices. inst{:--:}OSrev.fs has only
 support for disks configured into the kernel. Starting the search at
 SCSI address 0, lun 0 and increasing, the first disk found will be sd0
 regardless of the address, the second will be sd1. KLONDIKE for example
@@ -15,7 +15,7 @@ has the following devices installed:
 	cd0 -> ID 3 LUN 0: Toshiba XM-4101TA CD-ROM drive
 	st0 -> ID 4 LUN 0: Tandberg TDC3600 QIC tape drive
 
-Only sd0-sd3 are supported by the inst-20.fs kernel.
+Only sd0-sd3 are supported by the inst{:--:}OSrev.fs kernel.
 
 Next you need to know what the install script wants to do.  This install
 is script on the ram disk root that can do most of the work of configuring
@@ -41,15 +41,15 @@ your disk.
 The Install Procedure:
 
   a) Adjust your console device settings.
-	The inst-20.fs kernel will come up with 9600 baud, 7 bits,
+	The inst{:--:}OSrev.fs kernel will come up with 9600 baud, 7 bits,
 	even parity and one stop bit. Adjust your terminal to match
 	these settings. The monitor's baud rate can be changed with
 	"baud d'9600".
 
-  b) Get inst-20.fs and boot the kernel.
+  b) Get inst{:--:}OSrev.fs and boot the kernel.
 
 	From Floppy: (and using the autoboot monitor)
-	If you have a 1.44 meg SCSI floppy drive, you can put inst-20.fs
+	If you have a 1.44 meg SCSI floppy drive, you can put inst{:--:}OSrev.fs
 	onto a 3.5" floppy disk. Insert the disk into your floppy
 	drive and use the monitor's boot command to boot the default
 	image from the floppy. The image booted will ask you for a
@@ -58,8 +58,8 @@ The Install Procedure:
 	Replace X with your drive number. For KLONDIKE X would be "2".
 
 	Tape:
-	You will need to load a copy of inst-20.fs into RAM.
-		- load the inst-20.fs at 0x288000
+	You will need to load a copy of inst{:--:}OSrev.fs into RAM.
+		- load the inst{:--:}OSrev.fs at 0x288000
 		- run at 0x3E8820
 	The boot program will ask you now for a kernel to load. Answer
 		rd0a:/bsd
@@ -71,7 +71,7 @@ The Install Procedure:
 	output to standard output a byte sequence used by the pc532
 	ROM monitor to download a binary file into RAM.  Using this
 	program on a computer connected to the pc532, one can
-	load a copy of inst-20.fs into RAM at 0x288000.  The boot
+	load a copy of inst{:--:}OSrev.fs into RAM at 0x288000.  The boot
 	sequence is now the same as with tape.
 
   c) Choose a disk geometry.  For me, the reported geometry left
@@ -81,7 +81,7 @@ The Install Procedure:
 	2053880 sectors.
 
 	To help in this process, there is a program "factor" that is
-	on the inst-20.fs.  The usage is "factor number" and it lists
+	on the inst{:--:}OSrev.fs.  The usage is "factor number" and it lists
 	the prime factors of number.
 	For example, with the 2053880 sector disk I got:
 
@@ -114,9 +114,9 @@ The Install Procedure:
 	the auto-boot monitor), your root partition, your swap partition,
 	and then any other partitions you may want.  For the "other"
 	partitions, it will ask for a mount point.  The mount point will
-	be "relative to /" and should not include the leading "/".  Also,
+	be "relative to /" and should not {:-include-:} the leading "/".  Also,
 	IF you do not want the partition to have newfs run on it (that is
-	it might be the last one and have a copy of inst-20.fs) enter "NO"
+	it might be the last one and have a copy of inst{:--:}.fs) enter "NO"
 	to the mount point and it will not run newfs on the partition.
 	It will enter the partition into the disklabel.
 
diff --git a/distrib/notes/pc532/whatis b/distrib/notes/pc532/whatis
index 04d89c1aed6..28ba57ed5bd 100644
--- a/distrib/notes/pc532/whatis
+++ b/distrib/notes/pc532/whatis
@@ -1,4 +1,4 @@
-For the pc532 port, there are a few known problems.  They include:
+For the pc532 port, there are a few known problems.  They {:-include-:}:
 
   a) ppp reports a lot of input errors on some machines.
 
diff --git a/distrib/notes/pc532/xfer b/distrib/notes/pc532/xfer
index b54266c9811..e08d975dc74 100644
--- a/distrib/notes/pc532/xfer
+++ b/distrib/notes/pc532/xfer
@@ -10,7 +10,7 @@ sends data to the ROM monitor over the serial line.
 You may need to find and read the documentation about the ROM monitor
 download command and other low level commands.
 
-Other methods of getting OpenBSD/pc532 on your pc532 may include 
+Other methods of getting OpenBSD/pc532 on your pc532 may {:-include-:}
 SCSI tape or SCSI floppy disk or cloning a disk on a system
 already running OpenBSD/pc532.
 
diff --git a/distrib/notes/pmax/contents b/distrib/notes/pmax/contents
index 645e185eb12..a4ec12a9f59 100644
--- a/distrib/notes/pmax/contents
+++ b/distrib/notes/pmax/contents
@@ -1,82 +1,37 @@
-The pmax-specific portion of the OpenBSD 2.3 release is found in the
-"pmax" subdirectory of the distribution.  That subdirectory is laid
-out as follows:
+TopPart
 
-.../2.3/pmax/
-		INSTALL.pmax	Installation notes; this file.
-
-		*.gz		pmax binary distribution sets;
-				see below.
+OpenBSDdistsets
 
 		simpleroot*	pmax boot and installation
 				simpleroot files; see below.
 
-There is a pmax simpleroot image named simpleroot23.fs (it is usually
-compressed using gzip - simpleroot23.fs.gz - so you need gunzip first
-to uncompress it) subdirectory of the OpenBSD 2.3 distribution.  This
+There is a pmax simpleroot image named simpleroot{:--:}OSrev.fs (it is usually
+compressed using gzip - simpleroot{:--:}OSrev.fs.gz - so you need gunzip first
+to uncompress it) subdirectory of the OpenBSD OSREV distribution.  This
 file you can dump onto a disk and boot from it to start the installation
-of OpenBSD/pmax. Also there is a simpleroot23.tar.gz file there.  It
+of OpenBSD/pmax. Also there is a simpleroot{:--:}OSrev.tar.gz file there.  It
 can be used as root area on the NFS server if you plan to install via
 network.
 
-The OpenBSD/pmax binary distribution sets contain the binaries which
-comprise the OpenBSD 2.3 release for the pmax.  There are seven binary
-distribution sets.  The binary distribution sets can be found in
-subdirectories of the "pmax/bins" subdirectory of the OpenBSD 2.3
-distribution tree, and are as follows:
+DistributionDescription
 
-	base23	The OpenBSD/pmax 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.
-		[ 13.9M gzipped, 47.2M uncompressed ]
+OpenBSDbase(13.9M,47.2M)
 
-	comp23	The OpenBSD/pmax Compiler tools.  All of the tools
-		relating to C, C++, and FORTRAN (yes, there are two!).
-		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.
-		[ 13.1M gzipped, 51.8M uncompressed ]
+OpenBSDcomp(13.1M,51.8M)
 
-	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.)
-		[ 94K gzipped, 500K uncompressed ]
+OpenBSDetc(94K,500K)
 
-	game23	This set includes the games and their manual pages.
-		[ 2.8M gzipped, 7.2M uncompressed ]
+OpenBSDgame(2.8M,7.2M)
 
-	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.1M uncompressed ]
+OpenBSDman(2.4M,9.1M)
 
-	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.9M uncompressed ]
+OpenBSDmisc(1.7M,5.9M)
 
-	text23	This set includes OpenBSD's text processing tools,
-		including groff, all related programs, and their
-		manual pages.
-		[ 957K gzipped, 4.0M uncompressed ]
+OpenBSDtext(957K,4.0M)
 
-	xbase23 This set includes the base X distribution.  This includes
-		programs, headers, libraries, configuration files.
+OpenBSDxbase
 
-	xfont23 This set includes all of the X fonts.
+OpenBSDxfont
 
-	xserv23 This set includes all of the X servers.
+OpenBSDxserv
 
diff --git a/distrib/notes/pmax/hardware b/distrib/notes/pmax/hardware
index 57d414ddfd0..9ba156cc273 100644
--- a/distrib/notes/pmax/hardware
+++ b/distrib/notes/pmax/hardware
@@ -1,11 +1,11 @@
-OpenBSD/pmax 2.3 runs on the following classes of machines:
+OpenBSD/MACHINE OSrev runs on the following classes of machines:
 	- Decstation 2100 and 3100, also known as "pmin" and  "pmax" 
 	- Personal Decstations (5000/20, and /25)  also known as "MAXINE"
 	- Decstation 5000/120, /125, and /133, also known as "3MIN"
 	- Decstation 5000/200, also known as "3MAX"
 	- Decstation 5000/240, also known as "3MAXPLUS"
 
-OpenBSD/pmax 2.3 does *not* (yet) run on these machines:
+OpenBSD/MACHINE OSrev does *not* (yet) run on these machines:
 	- Decstation 5100 (an r2000-based cousin of the Decstation 3100)
 	- Decsystem 5400 and 5500 (Qbus-based systems, similar to a
 	  Vax 'Mayfair' and 'Mayfair II', but with an r2000a or r3000
@@ -20,7 +20,7 @@ RAM feels like Ultrix with 8M of RAM.) Note that until you have
 around 16M of RAM, getting more RAM is more important than getting a
 faster CPU.
 
-Supported devices include:
+Supported devices {:-include-:}:
 	Decstation 2100 and 3100 baseboard video: 
 		pm one-bit mono or 8-bit pseudocolor frame buffers.
 
diff --git a/distrib/notes/pmax/install b/distrib/notes/pmax/install
index f827f6a57ba..13b3870b314 100644
--- a/distrib/notes/pmax/install
+++ b/distrib/notes/pmax/install
@@ -28,7 +28,7 @@ onto the pmax which allows you to write to the raw disk - i.e. on all
 UN*X like operating systems it should work using "dd". On OpenBSD
 as well as SunOS you use a command like:
 
-	# dd if=simpleroot23.fs of=/dev/rsd0c bs=20b
+	# dd if=simpleroot{:--:}OSrev.fs of=/dev/rsd0c bs=20b
 
 Especially on OpenBSD/pmax you'll have to use /dev/rrz0c or something
 like that instead of /dev/rsd0c.
@@ -89,7 +89,7 @@ documentation that came with it (on SunOS systems, add_client(8) is a
 good start).
 
 One part of the distribution of OpenBSD/pmax is a file called
-simpleroot23.tar.gz which is a good start for the root filesystem area on
+simpleroot{:--:}OSrev.tar.gz which is a good start for the root filesystem area on
 the NFS server then you want to install via network.
 
 A few configuration files need to be edited:
@@ -108,7 +108,7 @@ A few configuration files need to be edited:
 
 Now you must populate the the `/dev' directory for your client. If you
 have an intelligent tar command on the NFS server the /dev directory
-inside the simpleroot23.tar.gz should be usable (i.e. containing
+inside the simpleroot{:--:}OSrev.tar.gz should be usable (i.e. containing
 special devices and not only files) - else you'll have to remake the
 devices on the server using
 
@@ -178,7 +178,7 @@ Ok - now let's see what to do to set up the server:
     
     mkdir /export/root
     cd /export/root
-    tar xvpzf /some_path/simpleroot23.tar.gz
+    tar xvpzf /some_path/simpleroot{:--:}OSrev.tar.gz
     vi /etc/exports (to add the above line)
     kill -HUP `cat /var/run/mountd.pid` (so that mountd rereads exports)
 
@@ -310,7 +310,7 @@ character is treated as a comment and need not be filled in when
 altering partitions.
 
 Special note: the line containing `8 partitions:' is best left alone,
-even if you define less then eight partitions. If this line displays
+even if you {:-define-:} less then eight partitions. If this line displays
 a different number and the program complains about it (after you leave
 the editor), then try setting it to `8 partitions:'.
 
@@ -420,19 +420,5 @@ incarnation to make the root filesystem writable is
 
 assuming your rootdisk is rz0.
 
-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.
-
-Some of the files in the OpenBSD 2.3 distribution might need to be
-tailored for your site.  In particular, the /etc/sendmail.cf file will
-almost definitely need to be adjusted, and other files in /etc will
-probably need to be modified.  If you are unfamiliar with UN*X-like
-system administration, it's recommended that you buy a book that
-discusses it.
-
-I am very interested in reports of how the installation worked - so if
-you got OpenBSD/pmax installed (or if you have problems doing this)
-please send a mail to me: graichen@OpenBSD.org - thanks.
+OpenBSDCongratulations
+
diff --git a/distrib/notes/pmax/whatis b/distrib/notes/pmax/whatis
index 96547ac8b2e..40d04838a81 100644
--- a/distrib/notes/pmax/whatis
+++ b/distrib/notes/pmax/whatis
@@ -1,4 +1,4 @@
-OpenBSD 2.3 is the first public release of OpenBSD for the DECstation
+OpenBSD OSREV is the first public release of OpenBSD for the DECstation
 and DECsystem family of computers.  This release includes kernel
 support for ELF shared libraries and uses them throughout the
 userland.
diff --git a/distrib/notes/powerpc/contents b/distrib/notes/powerpc/contents
index 1bf6b2285dc..11c87e4c1e1 100644
--- a/distrib/notes/powerpc/contents
+++ b/distrib/notes/powerpc/contents
@@ -1,32 +1,18 @@
-The powerpc-specific portion of the OpenBSD 2.3 release is found in the
-"powerpc" subdirectory of the distribution.  That subdirectory is laid
-out as follows:
+TopPart
 
-.../2.3/powerpc/
-		INSTALL.powerpc	Installation notes; this file.
+OpenBSDfloppy
 
-		CKSUM		Output of the cksum(1) and md5(1) programs
-		MD5		usable for verification of the correctness
-				of downloaded files.
+OpenBSDdistsets
 
-		floppy.fs	The powerpc boot and installation
-				floppy; see below.
-
-		*.tar.gz	powerpc binary distribution sets;
-				see below.
-
-		bsd		A stock GENERIC powerpc kernel which
-				will be installed on your system
-				during the install.
+OpenBSDbsd
 
 As well you may be interested in
 
-.../2.3/tools/
+.../OSREV/tools/
 		miscellaneous i386 installation utilities like
 		rawrite.exe, gzip.exe, and pfdisk.exe; see
 		installation section, below.
 
-
 In summary, there is one powerpc floppy image called "floppy.fs".  This
 is a bootable install floppy which can be used both to install and to
 upgrade OpenBSD to the current version.  It is also useful for maintenance
@@ -42,64 +28,25 @@ Bootable installation/upgrade floppy:
 	It also holds the utilities needed in order to upgrade a
 	system to the current version of OpenBSD.
 
-The OpenBSD/powerpc binary distribution sets contain the binaries which
-comprise the OpenBSD 2.3 release for the powerpc.  There are seven binary
-distribution sets.  The binary distribution sets can be found in
-the "powerpc" subdirectory of the OpenBSD 2.3 distribution tree,
-and are as follows:
-
-	base23	The OpenBSD/powerpc 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.
-		[ 12.5M gzipped, 35.1M uncompressed ]
-
-	comp23	The OpenBSD/powerpc Compiler tools.  All of the tools
-		relating to C, C++, and FORTRAN (yes, there are two!).
-		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.7M gzipped, 24.2M 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, 450K uncompressed ]
-
-	game23	This set includes the games and their manual pages.
-		[ 2.8M 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.5M gzipped, 9.6M 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, 6.1M uncompressed ]
-
-	text23	This set includes OpenBSD's text processing tools,
-		including groff, all related programs, and their
-		manual pages.
-		[ 1.0M 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.
+DistributionDescription
+
+OpenBSDbase(12.5M,35.1M)
+
+OpenBSDcomp(7.7M,24.2M)
+
+OpenBSDetc(92K,450K)
+
+OpenBSDgame(2.8M,6.7M)
+
+OpenBSDman(2.5M,9.6M)
+
+OpenBSDmisc(1.7M,6.1M)
+
+OpenBSDtext(1.0M,3.5M)
+
+OpenBSDxbase
+
+OpenBSDxfont
+
+OpenBSDxserv
 
diff --git a/distrib/notes/powerpc/hardware b/distrib/notes/powerpc/hardware
index a5e60aa9f08..732181c5a72 100644
--- a/distrib/notes/powerpc/hardware
+++ b/distrib/notes/powerpc/hardware
@@ -1,4 +1,4 @@
-OpenBSD/powerpc 2.3 runs on ISA (AT-Bus), and PCI buses
+OpenBSD/MACHINE OSREV runs on ISA (AT-Bus), and PCI buses
 with 603, 603e, 604, 604e processors.
 Only systems with openfirmware are supported.
 Has been tested on various Motorola (MCG) boards:
@@ -11,7 +11,7 @@ disk space, though we do not know of anyone running with a system
 quite this minimal today.  To install the entire system requires much
 more disk space,
 
-Supported devices include:
+Supported devices {:-include-:}:
 	ONLY DEVICES SUPPORTED BY OPENFIRMWARE ON THE MACHINE.
 
 	Floppy controllers.
diff --git a/distrib/notes/powerpc/install b/distrib/notes/powerpc/install
index a2cc5ddbfab..36dfd1d00af 100644
--- a/distrib/notes/powerpc/install
+++ b/distrib/notes/powerpc/install
@@ -41,7 +41,7 @@ process again from scratch.
 	floppy.fs floppy image to a different disk, and using that.
 	If it still doesn't work, OpenBSD probably can't be run on your
 	hardware.  This can probably be considered a bug, so you might
-	want to report it.  If you do, please include as many details
+	want to report it.  If you do, please {:-include-:} as many details
 	about your system configuration as you can.
 
 	It will take a while to load the kernel from the floppy,
@@ -146,7 +146,7 @@ process 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
@@ -179,194 +179,21 @@ process 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/powerpc
-		       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
-		powerpc this is "2.3/powerpc".
-
-		For instructions on how to complete the installation from
-		the CD-ROM distribution, see the section named "Common
-		file system installations" below.
+OpenBSDFTPInstall
+
+OpenBSDHTTPInstall
+
+OpenBSDTAPEInstall
+
+OpenBSDCDROMInstall
 		
-	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" 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 fast
-		file system (ffs) or MS-DOS.
-
-		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.
+OpenBSDNFSInstall
+
+OpenBSDDISKInstall(,,{:- or MS-DOS-:})
 		
-	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 "base22" and "etc22" 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.
-
-Some of the files in the OpenBSD 2.3 distribution might need to be
-tailored for your site.  In particular, the /etc/sendmail.cf file will
-almost definitely need to be adjusted, and other files in /etc will
-probably need to be modified, as well.  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/powerpc/upgrade b/distrib/notes/powerpc/upgrade
index fedcc8b9c23..6dbfbf46d9d 100644
--- a/distrib/notes/powerpc/upgrade
+++ b/distrib/notes/powerpc/upgrade
@@ -11,8 +11,8 @@ disk with 386BSD, FreeBSD or NetBSD.  Note that the latter three can
 NOT easily share the disk with each others.
 
 To do the upgrade, you must have the appropriate kernel-copy floppy
-image on a disk, and the upgr20.fs floppy image on another.  You must
-also have at least the "base20" binary distribution set available,
+image on a disk, and the upgr{:--:}OSrev.fs floppy image on another.  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
@@ -35,7 +35,7 @@ To upgrade your system, follow the following instructions:
 	"Boot" and ends with ":-"), hit return.
 
 	You will be prompted to insert a file system floppy.  Remove
-	the kernel-copy floppy and insert the upgr20 floppy, then hit
+	the kernel-copy floppy and insert the upgr{:--:}OSrev floppy, then hit
 	any key to continue booting.
 
 	While booting, you will probably see several warnings.  You
@@ -96,13 +96,13 @@ 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), change into the
-	directory containing the "base20" distribution set.  Once you
+	directory containing the "base{:--:}OSrev" distribution set.  Once you
 	are there, run the "Set_tmp_dir" command, and hit return at
 	the prompt to select the default answer for the temporary
 	directory's path name.  (It should be the path name of the
 	directory that you're in.)
 
-	Run the command "Extract base20" to upgrade the base
+	Run the command "Extract base{:--:}OSrev" to upgrade the base
 	distribution.
 
 	Repeat the above two steps for all of the sets you wish to
@@ -121,8 +121,8 @@ To upgrade your system, follow the following instructions:
 	up the installation, by remaking some system databases.  When
 	it is complete, you should use "halt" to halt the system.
 
-	When the system is halted, remove the "upgr20" floppy from
-	the floppy drive, and replace it with the OpenBSD 2.3
+	When the system is halted, remove the "upgr{:--:}OSrev" floppy from
+	the floppy drive, and replace it with the OpenBSD OSREV
 	kernel-copy floppy that you previously booted from. Reboot
 	with that floppy.
 
@@ -151,15 +151,15 @@ To upgrade your system, follow the following instructions:
 	Once the system is halted, remove the kernel-copy floppy from
 	the floppy disk drive, and hit any key to reboot.
 
-Your system has now been upgraded to OpenBSD 2.3.
+Your system has now been upgraded to OpenBSD OSREV.
 
         After a new kernel has been copied to your hard disk, your
-	machine is a complete OpenBSD 2.3 system.  However, that
+	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.
 
-	Second, you will probably want to get the etc20 distribution,
+	Second, you will probably want to get the etc{:--:}OSrev 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/powerpc/whatis b/distrib/notes/powerpc/whatis
index 3bb55150f1a..cfa25c9954c 100644
--- a/distrib/notes/powerpc/whatis
+++ b/distrib/notes/powerpc/whatis
@@ -1,2 +1,2 @@
-For the powerpc, OpenBSD 2.3 is a new release of our existing code.  This
+For the powerpc, OpenBSD OSREV is a new release of our existing code.  This
 port is not completely reliable or fast.
diff --git a/distrib/notes/powerpc/xfer b/distrib/notes/powerpc/xfer
index 3766bade78b..faca33d1d80 100644
--- a/distrib/notes/powerpc/xfer
+++ b/distrib/notes/powerpc/xfer
@@ -47,14 +47,14 @@ following:
 	(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 "base23"
-	and "etc23" distributions on tape (in order to do the absolute
+	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 .../1.2		# the top of the tree
+		cd .../OSREV		# the top of the tree
 		cd powerpc/
-		tar cf <tape_device> base23 etc23
+		tar cf <tape_device> base{:--:}OSrev etc{:--:}OSrev
 
 	(Note that you still need to fill in "<tape_device>" in the
 	example.)
@@ -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" set somewhere in your file system.  If you wish,
+	"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.
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index ee6ac9cccc6..bfdb17ba9bc 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -1,25 +1,22 @@
-The sparc-specific portion of the OpenBSD 2.3 release is found in the
-"sparc" subdirectory of the distribution.  That subdirectory is organized
-as follows:
+TopPart
 
-.../2.3/sparc/
-		INSTALL.sparc	Installation notes; this file
 
-                kc23.fs		The sparc boot floppy; see below.
-		inst23.fs	The sparc installation floppy; see below.
-		upgr23.fs	The sparc upgrade floppy; see below.
-		miniroot23.fs	The sparc miniroot filesystem; see below.
-                floppy23.fs     The sparc compressed ramdisk boot floppy
+                kc{:--:}OSrev.fs		The sparc boot floppy; see below.
 
-		CKSUM		Output of the cksum(1) and md5(1) programs
-		MD5		usable for verification of the correctness
-				of downloaded files.
+		inst{:--:}OSrev.fs	The sparc installation floppy; see below.
 
-		*.tar.gz	sparc binary distribution sets;
-				see below.
+		upgr{:--:}OSrev.fs	The sparc upgrade floppy; see below.
+
+OpenBSDminiroot
+
+OpenBSDfloppy
+
+OpenBSDdistsets
+
+OpenBSDbsd
+
+OpenBSDrd
 
-		bsd		A stock GENERIC kernel
-                bsd.rd		A ramdisk kernel
 		bsd.scsi3	A kernel with SCSI target 3 re-mapped as 0
 				and 0 mapped as 3.
 
@@ -33,18 +30,18 @@ Please note that there are multiple bootable images and kernels, intended
 to allow installing OpenBSD/sparc in a variety of situations without
 requiring a pre-existing working operating system.
 
-The "kc23.fs" image is a bootable floppy image, which is used in conjunction
-with "inst23.fs" or "upgr23.fs", to allow installing or upgrading systems
+The "kc{:--:}OSrev.fs" image is a bootable floppy image, which is used in conjunction
+with "inst{:--:}OSrev.fs" or "upgr{:--:}OSrev.fs", to allow installing or upgrading systems
 with supported floppy disk drives (not Sun4m at this time).
 
-The "miniroot23.fs" is a small bootable root filesystem that can be used
+The "miniroot{:--:}OSrev.fs" is a small bootable root filesystem that can be used
 for installation or upgrade where there is some means to copy the miniroot
 image into a swap or unused partition on the system, and also for diskless
 or net booting.  This can be convenient if you have a existing installation
 of OpenBSD, NetBSD, SunOS, or Solaris and wish to test or upgrade the
 existing system to OpenBSD.
 
-The "floppy23.fs" is a new bootable floppy image, with contents similar
+The "floppy{:--:}OSrev.fs" is a new bootable floppy image, with contents similar
 to a miniroot stored in a compressed kernel with pre-loaded ramdisk.  As
 of release time, this version has not received adequate testing and may
 not work reliably on many systems, but is provided as a convenience for
@@ -61,86 +58,48 @@ Sun bootblocks require a separate kernel image and root filesystem.
 
 Bootable installation/upgrade floppies:
   
-  kc23.fs
+  kc{:--:}OSrev.fs
  	This disk is bootable, and only contains the boot loader and
         kernel.
 
-  inst23.fs
+  inst{:--:}OSrev.fs
 	This disk contains an installation file system, and has enough 
 	utilities on board to prepare your hard disk drive for OpenBSD.
 
-  upgr23.fs
+  upgr{:--:}OSrev.fs
 	This disk contains a file system, and has holds the utilities 
 	needed in order to upgrade an existing OpenBSD (or NetBSD) system
 	to a minimal working OpenBSD 2.3 system.
 
-  floppy23.fs
+  floppy{:--:}OSrev.fs
 	This disk contains a compressed ramdisk filesystem, and holds
         all utilities needed to install or upgrade to OpenBSD 2.3
   
-  miniroot23.fs
+  miniroot{:--:}OSrev.fs
 	This is a miniroot filesystem image which can be copied to the
 	swap partition of an existing OpenBSD, NetBSD, Linux, SunOS, 
 	or Solaris installation to allow upgrading to OpenBSD 2.3
 
 
-The OpenBSD/sparc binary distribution sets contain the binaries which
-comprise the OpenBSD 2.3 release for the sparc.  There are seven binary
-distribution sets.  These binary distribution sets can be found in
-the "sparc" subdirectory of the OpenBSD 2.3 distribution tree,
-and are as follows:
-
-	base23	The OpenBSD/sparc 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.
-		[ 12.7M gzipped, 39.7M 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 then CAREFULLY upgrade your
-		configuration files by hand.)
-		[ 97K gzipped, 510K uncompressed ]
-
-	comp23	The OpenBSD/sparc Compiler tools.  All of the tools
-		relating to C, C++, and FORTRAN.
-		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.
-		[ 8.2M gzipped, 27.4M uncompressed ]
-
-	game23	This set includes the games and their manual pages.
-		[ 2.8M gzipped, 6.9M 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.9M uncompressed ]
-
-	text23	This set includes OpenBSD's text processing tools,
-		including groff, all related programs, and their
-		manual pages.
-		[ 994K gzipped, 3.7M 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.
+DistributionDescription
+
+OpenBSDbase(12.7M,39.7M)
+
+OpenBSDetc(97K,510K)
+
+OpenBSDcomp(8.2M,27.4M)
+
+OpenBSDgame(2.8M,6.9M)
+
+OpenBSDman(2.4M,9.2M)
+
+OpenBSDmisc(1.7M,5.9M)
+
+OpenBSDtext(994K,3.7M)	
+
+OpenBSDxbase
+	
+OpenBSDxfont
+
+OpenBSDxserv
 
diff --git a/distrib/notes/sparc/hardware b/distrib/notes/sparc/hardware
index fc003ad46b3..7125a2d4bfd 100644
--- a/distrib/notes/sparc/hardware
+++ b/distrib/notes/sparc/hardware
@@ -24,7 +24,7 @@ RAM feels like Solaris with 4M of RAM.) Note that until you have
 around 16M of RAM, getting more RAM is more important than getting a
 faster CPU.)  Installation from "ramdisk" kernels requires 8M of RAM.
 
-Supported devices include:
+Supported devices {:-include-:}:
 	sun4c and sun4m SBus video: 
 		cgsix, cgthree, and bwtwo frame buffers
 
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index 889868656d0..c9db3feb25b 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -10,10 +10,10 @@ If your Sparc is hooked up in a network and you can find a server to
 arrange for a diskless setup, which is a convenient way to install on a
 machine whose disk does not currently hold a usable operating system.
 This is difficult to get set up correctly the first time, but easy to
-use afterwards.  (see `Installing using a diskless setup' below).
+use afterwards.  (see ``Installing using a diskless setup'' below).
 
 It is also possible to install OpenBSD "manually" from a running SunOS
-system, using SunOS tools and gnu tar and gunzip (see `Installing from SunOS' 
+system, using SunOS tools and gnu tar and gunzip (see ``Installing from SunOS''
 below).
 
 
@@ -45,8 +45,8 @@ same thing, but the install/upgrade scripts and procedures are quite
 different between the old and new version.
 
 The other difference between the the two forms are in their bootblocks,
-and filesystems.  The "floppy23.fs" image is the compressed ramdisk form,
-the "kc23.fs" paired with either "inst23.fs" or "upgr23.fs" comprise a
+and filesystems.  The "floppy{:--:}OSrev.fs" image is the compressed ramdisk form,
+the "kc{:--:}OSrev.fs" paired with either "inst{:--:}OSrev.fs" or "upgr{:--:}OSrev.fs" comprise a
 bootable kernel floppy and associated install/upgrade filesystem floppy.
 
 The CD-ROM, miniroot and netboot install scripts are essentially the
@@ -110,8 +110,8 @@ the appropriate filesystem floppy, for the ramdisk installation,
 just hit return, the filesystem image is internal to the kernel.
 
 After the initial device probe messages you'll asked to start the
-install or upgrade procedure. Proceed to the section `Running the
-installation scripts' below.
+install or upgrade procedure. Proceed to the section ``Running the
+installation scripts'' below.
 
 
 Booting From CD-ROM installation media:
@@ -132,8 +132,8 @@ does not work, you'll have to create a boot floppy or bootable
 hard disk using the instructions under preparing boot media.
 
 After the initial device probe messages you'll asked to start the
-install or upgrade procedure. Proceed to the section `Running the
-installation scripts' below.
+install or upgrade procedure. Proceed to the section ``Running the
+installation scripts'' below.
 
 
 Booting from SCSI disk (miniroot or floppy image)
@@ -161,8 +161,8 @@ drive vs. scsi-id shuffling and partition a=0, b=1...
 
 This will cause the kernel contained in the miniroot to be booted.
 After the initial probe messages you'll asked to start the install
-or upgrade procedure. Proceed to the section `Running the installation
-scripts' below.
+or upgrade procedure. Proceed to the section ``Running the installation
+scripts'' below.
 
 
 Installing using a diskless setup.
@@ -185,8 +185,8 @@ this command takes one of the following forms:
 
 This will cause the kernel provided by the diskless setup to be booted.
 After the initial probe messages you'll asked to start the install
-or upgrade procedure. Proceed to the section `Running the installation
-scripts' below.
+or upgrade procedure. Proceed to the section ``Running the installation
+scripts'' below.
 
 
 Installing using the "new" Single Floppy, CD-ROM, miniroot or netboot
@@ -289,7 +289,7 @@ may be a better option.
 	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
@@ -326,187 +326,21 @@ may be a better option.
 	images.  Note that installation sets on multiple floppies is 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/sparc
-		       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 "cd0".  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
-		sparc this is "2.3/sparc".
-
-		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
-		only install from partitions that use the fast file system
-		(ffs).
-
-		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
 		
-	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.)  If any sets have already been extracted,
-		those sets will be marked with an X.
-
-		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.
+OpenBSDNFSInstall
 
+OpenBSDDISKInstall({:-"wdN" or -:},{:-only -:})
 
+OpenBSDCommonFS
+		
+OpenBSDCommonURL
 
 Installing using the old Multi-Floppy procedure.
 
@@ -564,21 +398,13 @@ On version 2 OpenBOOT ROMs:
 On sun4 systems, you may not need to specify the boot file, as 
 the OpenBSD boot blocks will look for "bsd" on the boot device by default.
 
-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.
-
-Some of the files in the OpenBSD 2.3 distribution might need to be
-tailored for your site.  In particular, the /etc/sendmail.cf file will
-almost definitely need to be adjusted, and other files in /etc will
-probably need to be modified.  If you will be running your OpenBSD 
-system from a serial console, you may need to edit /etc/ttys and
-change the terminal type, and getty method from "sun" and "suncons"
-to "vt100" and "std.9600" or something similar.  Also when running
-from a serial console, you may wish to adjust the eeprom settings
-for input-device, output-device, screen-#columns, and screen-#rows
+OpenBSDCongratulations
+
+If you will be running your OpenBSD system from a serial console, you may
+need to edit /etc/ttys and change the terminal type, and getty method from
+"sun" and "suncons" to "vt100" and "std.9600" or something similar.  Also
+when running from a serial console, you may wish to adjust the eeprom
+settings for input-device, output-device, screen-#columns, and screen-#rows
 as appropriate.  
 
 If you plan on using the extra serial ports on 4/300 systems, 
@@ -606,7 +432,7 @@ Installing from SunOS.
 You need a SunOS machine to install OpenBSD.  You also need at
 least the following pieces:
 
-    the *.tar.gz files you want to install (as a minimum, base23.tar.gz)
+    the *.tar.gz files you want to install (as a minimum, base{:--:}OSrev.tar.gz)
     gunzip (GNU gzip) SunOS binary
     gtar (GNU tar) SunOS binary
     a "/boot" file from a SunOS machine that matches your machine type
@@ -663,11 +489,11 @@ The installboot man page says to do something like this:
 You can now extract the provided "*.tar.gz files onto your disk.
 
     sunos# ls -FC
-    base23.tar.gz      etc23.tar.gz       man23.tar.gz       secr23.tar.gz
-    comp23.tar.gz      games23.tar.gz     misc23.tar.gz      text23.tar.gz
-    xbase23.tar.gz     xfont23.tar.gz     xserv23.tar.gz     bsd
+    base{:--:}OSrev.tar.gz      etc{:--:}OSrev.tar.gz       man{:--:}OSrev.tar.gz       secr23.tar.gz
+    comp{:--:}OSrev.tar.gz      game{:--:}OSrev.tar.gz      misc{:--:}OSrev.tar.gz      text{:--:}OSrev.tar.gz
+    xbase{:--:}OSrev.tar.gz     xfont{:--:}OSrev.tar.gz     xserv{:--:}OSrev.tar.gz     bsd
     bsd.scsi3
-    sunos# gunzip < base23.tar.gz | (cd /mnt; gtar xvpf -)
+    sunos# gunzip < base{:--:}OSrev.tar.gz | (cd /mnt; gtar xvpf -)
     [...] for each set
 
 And finally copy an OpenBSD kernel (either bsd or bsd.scsi3) onto your disk.
@@ -746,17 +572,17 @@ handle corresponding to the root filesystem. If successful, the boot
 program starts reading from the remote root filesystem in search of the
 kernel which is then read into memory.
 
-You will want export the miniroot23.fs filesystem to the client.  You
+You will want export the miniroot{:--:}OSrev.fs filesystem to the client.  You
 can dd this filesystem image to some spare partition, mount and export
 that partition or use tar to copy the contents to a more convenient spot.
 
 Alternatively you can build a bootable partition from the distribution sets
 as follows:
 
-Unpack `base23.tar.gz' and `etc23.tar.gz' on the server in the root directory
+Unpack `base{:--:}OSrev.tar.gz' and `etc{:--:}OSrev.tar.gz' on the server in the root directory
 for your target machine. If you elect to use a separately NFS-mounted
 filesystem for `/usr' with your diskless setup, make sure the "./usr" base
-files in base23.tar.gz end up in the correct location. One way to do this is
+files in base{:--:}OSrev.tar.gz end up in the correct location. One way to do this is
 to temporarily use a loopback mount on the server, re-routing <root>/usr to
 your server's exported OpenBSD "/usr" directory. Also put the kernel and
 the install/upgrade scripts into the root directory.
diff --git a/distrib/notes/sun3/contents b/distrib/notes/sun3/contents
index 0a57cb45343..b802ea82d67 100644
--- a/distrib/notes/sun3/contents
+++ b/distrib/notes/sun3/contents
@@ -1,9 +1,4 @@
-The sun3-specific portion of the OpenBSD 2.3 release is found in the
-"sun3" subdirectory of the distribution.  That subdirectory is laid
-out as follows:
-
-.../2.3/sun3/
-		INSTALL.sun3	Installation notes; this file.
+TopPart
 
 		install/	Boot programs, a GENERIC kernel,
 				a stand-alone RAMDISK kernel,
@@ -39,63 +34,25 @@ OpenBSD/sun3.  These files can also be used to configure an NFS server
 to support installation "over the network".  See the section "Getting
 the OpenBSD System onto Useful Media" for instructions on either method.
 
-The OpenBSD/sun3 binary distribution sets contain the binaries which
-comprise the OpenBSD 2.3 release for the sun3.  There are seven binary
-distribution sets.  The binary distribution sets can be found in
-the "sun3" subdirectory of the OpenBSD 2.3 distribution tree,
-and are as follows:
-
-	base23	The OpenBSD/sun3 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.
-		[ 7.2M gzipped, 19M uncompressed ]
-
-	comp23	The OpenBSD/sun3 Compiler tools.  All of the tools
-		relating to C and C++.  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.
-		[ 4.6M gzipped, 14.7M 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.)
-		[ 64K gzipped, 348K uncompressed ]
-
-	games23	This set includes the games and their manual pages.
-		[ 2.8M gzipped, 6.8M 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.
-		[ 850K gzipped, 3.3M 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.8M gzipped, 6.5M uncompressed ]
-
-	text23	This set includes OpenBSD's text processing tools,
-		including groff, all related programs, and their
-		manual pages.
-		[ 770K gzipped, 2.8M 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.
+DistributionDescription
+
+OpenBSDbase(7.2M,19M)
+
+OpenBSDcomp(4.6M,14.7M)
+
+OpenBSDetc(64K,348K)
+
+OpenBSDgame(2.8M,6.8M)
+
+OpenBSDman(850K,3.3M)
+
+OpenBSDmisc(1.8M,6.5M)
+
+OpenBSDtext(770K,2.8M)
+
+OpenBSDxbase
+
+OpenBSDxfont
+	
+OpenBSDxserv
 
diff --git a/distrib/notes/sun3/install b/distrib/notes/sun3/install
index dcbb147fd4f..50e0106f828 100644
--- a/distrib/notes/sun3/install
+++ b/distrib/notes/sun3/install
@@ -13,7 +13,7 @@ initialize the disk on that machine and then move the disk.
 
 * Installing from tape:
 
-Create the OpenBSD/sun3 2.0 boot tape as described in the section
+Create the OpenBSD/sun3 OSREV boot tape as described in the section
 entitled "Preparing a boot tape" and boot the tape.  At the PROM
 monitor prompt, use one of the commands:
 	>b st()
@@ -172,3 +172,5 @@ The miniroot's install program will:
 
 First-time installation on a system through a method other than the
 installation program is possible, but strongly discouraged.
+
+OpenBSDCongratulations
diff --git a/distrib/notes/sun3/whatis b/distrib/notes/sun3/whatis
index ad5109dc30f..ddc58677f59 100644
--- a/distrib/notes/sun3/whatis
+++ b/distrib/notes/sun3/whatis
@@ -1,10 +1,10 @@
 
-OpenBSD 2.0 is the first "full" release of OpenBSD for the sun3,
+OpenBSD OSREV is the first "full" release of OpenBSD for the sun3,
 including a full set of binaries.  This binary distribution is
 referred to elsewhere in this document by the name OpenBSD/sun3.
 This release offers improved stability and many new features.
 
-New features added since the 1.0 release include:
+New features added since the 1.0 release {:-include-:}:
 * Native boot programs for disk, network, and tape
 * Automated installation tools (using a "miniroot")
 * New SCSI driver supporting DMA, interrupts, and