First cut at an updated INSTALL.

7 files changed, 459 insertions, 384 deletions

diff --git a/distrib/notes/hp300/contents b/distrib/notes/hp300/contents
index 6f1ad6da239..552f58fad9c 100644
--- a/distrib/notes/hp300/contents
+++ b/distrib/notes/hp300/contents
@@ -12,15 +12,27 @@ out as follows:
 		*.tar.gz	hp300 binary distribution sets;
 				see below.
 
-		bsd-gen		A stock GENERIC kernel, installation
-				utilities and a miniroot filesystem;
-				see below.
+		bsd		A stock GENERIC kernel.
+
+		bsd-dl		A GENERIC kernel without any support for
+				disk devices.
+
+		bsd-rd		A compressed RAMDISK kernel; the embedded
+				filesystem contains the installation tools.
+
+		SYS_UBOOT	Unified boot file, used for booting from
+				the network.
+
+		HP-IB.geometry	A file containing geometry for some HP-IB
+				disk drives.
+
+		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.2 release for the hp300.  There are seven binary
-distribution sets, and the "security" distribution set.  The binary
-distribution sets can be found in the "hp300/bins" subdirectory of
-the OpenBSD 2.2 distribution tree, and are as follows:
+distribution tar sets.  They may be found in the top of the "hp300"
+subdirectory of the OpenBSD 2.2 distribution tree, and are as follows:
 
 	base22	The OpenBSD/hp300 2.2 base binary distribution.  You
 		MUST install this distribution set.  It contains the
@@ -69,21 +81,3 @@ the OpenBSD 2.2 distribution tree, and are as follows:
 		manual pages.
 		[ 945.9K gzipped, 3.5M uncompressed ]
 
-The following are included in the `.../install' directory:
-
-	SYS_INST.gz	A gzipped copy of the SYS_INST miniroot
-			installation program.
-
-	SYS_NBOOT.gz	A gzipped copy of the network boot block.
-			This is useful if you are installing
-			a diskless OpenBSD/hp300 system.
-
-	inst-22.fs.gz	A gzipped copy of the miniroot filesystem.
-
-	bsd.gz		A gzipped GENERIC kernel.
-
-	rbootd.tar.gz	Source code for the rbootd(8) program, required
-			for netbooting an HP workstation.
-
-	HP-IB.geometry	A file containing geometry for some HP-IB
-			disk drives.
diff --git a/distrib/notes/hp300/hardware b/distrib/notes/hp300/hardware
index f3cd168b4cb..a2f0845c5f9 100644
--- a/distrib/notes/hp300/hardware
+++ b/distrib/notes/hp300/hardware
@@ -1,19 +1,8 @@
 OpenBSD/hp300 2.2 will run on most HP 9000/300- and 400-series machines.
-The lowest amount of RAM that has been tested is 7.5M, though it
+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.
 
-Here is a table of recommended HD partition sizes for a full install:
-	partition:	advise		needed
-	root (/)	15M		10M
-	user (/usr)	80M		45M
-	swap		(2 or 3 * RAM)	 6M	(see note below)
-	Anything else is up to you!
-
-NOTE:  The hp300 installation procedure utilizes a `miniroot' filesystem
-which is placed into the swap area of the disk.  The swap are must be
-at least large enough to hold this miniroot image.
-
 The following HP hardware is supported:
 
 	CPUs:
@@ -34,16 +23,19 @@ The following HP hardware is supported:
 		      the Archive Viper.
 
 	RS232 interfaces:
-		98644 built-in single port (dca).
+		98644 built-in and add-on single port (dca).
 		98642 4-port (dcm).
 		98638 8-port (dcm).
+		400-series Apollo 3-port serial/keyboard mux (apci).
+		[Note:  Support is incomplete.  The first port is typically
+		configured as a dca device.]
 
 	Network interfaces:
 		98643 built-in and add-on LAN cards.
 
 	Displays:
 		98544, 98545, and 98547 color and monochrome Topcat.
-		98548, 98549, and 98550 color and monochrome Catseye.
+		98548, 98549, 98550, and A1416A color and monochrome Catseye.
 		98700 and 98710 Gatorbox.
 		98720 and 98721 Renaissance.
 		98730 and 98731 DaVinci.
@@ -52,6 +44,7 @@ The following HP hardware is supported:
 	Input devices:
 		General interface supporting all HIL devices: keyboard,
 		2 and 3 button mice(***), and ID module.
+		400-series Apollo keyboards (bootblocks, kernel soon).
 
 	Miscellaneous:
 		Battery-backed real-time clock.
diff --git a/distrib/notes/hp300/install b/distrib/notes/hp300/install
index 446ebec2b0a..ecd545968d9 100644
--- a/distrib/notes/hp300/install
+++ b/distrib/notes/hp300/install
@@ -1,78 +1,317 @@
-The miniroot's install program is very simple to use.  It will guide
-you through the entire process, and is well automated.  Additional
-improvements are planned for future releases.
+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.
 
-The miniroot's install program will:
+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 provide limited
+information for SCSI disks, but not much.
 
-	* Allow you to place disklabels on additional disks.
-	  Note that partition sizes and offsets are expressed
-	  in sectors.  When you fill out the disklabel, you will
-	  need to specify partition types and filesystem parameters.
-	  If you're unsure what the these values should be, use the
-	  following:
+You should now be ready to install OpenBSD.  It might be handy for you
+to have a pencil, some paper, and a calculator handy.
 
-		fstype: 4.2BSD
-		fsize: 1024
-		bsize: 4096
-		cpg: 16
+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 the partition will be a swap partition, use the following:
+	Boot your machine from the CDROM or from the network.  When
+	presented with the boot prompt, enter the path of your kernel.
+	(`bsd.rd' is a likely choice if you are booting over the network,
+	otherwise check the CDROM insert for the pathname of the kernel.)
 
-		fstype: swap
-		fsize: 0 (or blank)
-		bsize: 0 (or blank)
-		cpg: 0 (or blank)
+	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 "hd0" and any geometry or size information 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.
 
-	  You will also need to specify the number of partitions.
-	  The number of partitions is determined by the `index' of
-	  the last partition letter, where a == 1, b == 2, etc.
-	  Therefore, if the last filled partition is partition `g',
-	  there are 7 partitions.  Any partitions with size of 0
-	  may be removed from the list.
+	While booting, you will probably see several warnings.  You
+	should be warned that no swap space is present, and that
+	init(8) cannot find /etc/rc.  Do not be alarmed, these are
+	completely normal.  When you reach the prompt asking you for a
+	shell name, just hit return.
 
-	  If the disk is the boot disk, you _must_ offset the root
-	  partition (`a') one cylinder, as the hp300 boot code
-	  if large enough to spill past the label area.  In this case,
-	  the `c' partition must be fstype `boot'.
+	You will be presented with a welcome message and a prompt.  At
+	this time you should enter the command "install" to start the
+	installation process.
 
-	  Anything after a `#' is a comment.
+	You will be asked which terminal type to use.  There are only
+	a few specific terminal types supported.  If you are using a
+	graphics display, just hit return to select the default (hp300h).
+	If you are using an ASCII terminal, it should either be an HP
+	or vt100 compatible terminal; nothing else is supported.
 
-	  The following is an example disklabel partition map:
+	The install program will then tell you which disks of that
+	type it can install on, and ask you which it should use.  The
+	name of the disk is typically "hd0" for HPIB/CS80 drives or
+	"sd0" for SCSI drives.  If you do not wish to install on the
+	first disk, you should use the appropiate number in place of "0".
+	Reply with the name of your disk.
 
-7 partitions:
-#        size   offset    fstype   [fsize bsize   cpg]
-  a:    30912      448    4.2BSD     1024  8192    16   # (Cyl.    1 - 69)
-  b:   130816    31360      swap                        # (Cyl.   70 - 361)
-  c:  1296512        0      boot                        # (Cyl.    0 - 2893)
-  e:    81984   162176    4.2BSD     1024  8192    16   # (Cyl.  362 - 544)
-  f:   102592   244160    4.2BSD     1024  4096    16   # (Cyl.  545 - 773)
-  g:   949760   346752    4.2BSD     1024  8192    16   # (Cyl.  774 - 2893)
+	Next you will have to edit or create a disklabel for the disk
+	OpenBSD is being installed on.  The installation script will invoke
+	an editor allowing you to do this.  Note that partition 'c' inside
+	this disk label should ALWAYS reflect the entire disk, including
+	any non-OpenBSD portions.  The root file system should be in
+	partition 'a', and swap is usually in partition 'b'.  It is
+	recommended that you create separate partitions for /usr and /var,
+	and if you have room for it, also for /home.
 
-	* Create filesystems on target partitions.
+	The swap partition (usually 'b') should have a type of "swap", all
+	other native OpenBSD partitions should have a type of "4.2BSD".
+	Block and fragment sizes are usually 8192 and 1024 bytes, but can
+	also be 4096 and 512 or even 16384 and 2048 bytes.
 
-	* Allow you to set up your system's network configuration.
-	  Remember to specify host names without the domain name
-	  appended to the end.  For example use `foo' instead of
-	  `foo.bar.org'.  If, during the process of configuring
-	  the network interfaces, you make a mistake, you will
-	  be able to re-configure that interface by simply selecting
-	  it for configuration again.
+	The install program will now label your disk and ask which file
+	systems should be created on which partitions.  It will auto-
+	matically select the 'a' partition to be the root file system.
+	Next it will ask for which disk and partition you want a file
+	system created on.  This will be the same as the disk name (eg.
+	"hd0") with the letter identifying the partition (eg. "d")
+	appended (eg. "hd0d").  Then it will ask where this partition is
+	to be mounted, eg. /usr.  This process will be repeated until
+	you just hit return.
 
-	* Mount target filesystems.  You will be given the opportunity
-	  to manually edit the resulting /etc/fstab.
+	At this point you will be asked to confirm that the file system
+	information you have entered is correct, and given an opportunity
+	to change the file system table.  Next it will create the new file
+	systems as specified, OVERWRITING ANY EXISTING DATA.  This is the
+	point of no return.
 
-	* Extract binary sets from the media of your choice.
+	After all your file systems have been created, the install program
+	will give you an opportunity to configure the network.  The network
+	configuration you enter (if any) can then be used to do the install
+	from another system using NFS, HTTP or FTP, and will also be the
+	configuration used by the system after the installation is complete.
 
-	* Copy configuration information gathered during the
-	  installation process to your root filesystem.
+	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.
 
-	* Make device nodes in your root filesystem.
+	Next the system will give you a list of network interfaces you can
+	configure.  For each network interface you select to configure, it
+	will ask for the IP address to use, the symbolic host name to use,
+	the netmask to use and any interface-specific flags to set.  No
+	interface-specific flags should be required.
 
-	* Copy a new kernel onto your root partition.
+	After all network interfaces has been configured the install pro-
+	gram will ask for a default route and IP address of the primary
+	name server to use.  You will also be presented with an opportunity
+	to edit the host table.
 
-	* Install a new boot block.
+	At this point you will be allowed to edit the file system table
+	that will be used for the remainder of the installation and that
+	will be used by the finished system, following which the new file
+	systems will be mounted to complete the installation.
 
-	* Check your filesystems for integrity.
+	After these preparatory steps has been completed, you will be
+	able to extract the distribution sets onto your system.  There
+	are several install methods supported; FTP, HTTP, tape, CD-ROM, NFS
+	or a local disk partition.  To install from a tape, the distrib-
+	ution sets must have been written to tape prior to running the
+	installation program, either as tar images or as gzipped tar
+	images.
 
-First-time installation on a system through a method other than the
-installation program is possible, but strongly discouraged.
+	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.2 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.2/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.
+
+		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.2 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 be "cd0"
+		for the first CD-ROM drive.  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.2/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
+		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.  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.2.  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.2 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.
diff --git a/distrib/notes/hp300/prep b/distrib/notes/hp300/prep
index 5922c99ff1e..ddbd0bc580b 100644
--- a/distrib/notes/hp300/prep
+++ b/distrib/notes/hp300/prep
@@ -1,11 +1,14 @@
-Currently, only installing the miniroot from the network is supported.
-This may change in a future release.
+The ramdisk kernel may be loaded from the network, from CD-ROM, or other
+SCSI devices (such as Zip(tm) disk).  This section primarily describes the
+setup required for a network boot, but does offer information pretaining to
+installation from other media.  Note that loading from HPIB or SCSI cartridge
+tape is possible, but not currently supported.
 
 You will need information about your disk's geometry, based on 512-byte
 sectors.  You must have this information before proceeding.  The
-file `.../install/HP-IB.geometry' has geometry inforomation for several
-HP-IB disks, but may be incomplete.  Geometry may be calculated from an
-HP-UX `/etc/disktab' entry, but note that HP-UX geometry is based on
+file `HP-IB.geometry' has geometry inforomation for several HP-IB disks,
+but may be incomplete.  Geometry may be calculated from an HP-UX 
+`/etc/disktab' entry, but note that HP-UX geometry is based on
 1024 byte sectors, while OpenBSD's is based on 512 byte sectors.
 
 QUICK NOTE ABOUT PARTITIONS:  Since the target disk will become the boot
@@ -18,69 +21,47 @@ of the disk.  Later, the `c' partition will be marked with the type
 with historic BSD partition conventions, the `c' partition is defined
 as `the entire disk', or the `raw partition'.)
 
-A QUICK NOTE ABOUT DISK NUMBERS:  While in the SYS_INST program, you
-may use different unit numbers for the disks than when the OpenBSD
-kernel is running.  The unit number for a disk while in SYS_INST is
-calculated with the following formula:
-
-	unit = (controller * 8) + slave
-
-Controllers are numbered 0, 1, ... starting with the lowest select code.
-SCSI controllers and HP-IB controllers are counted separately.  Therefore,
-if you had a system with an internal HP-IB interface at select code 7,
-a fast HP-IB interface at select code 14, and a SCSI interface at select
-code 16, unit numers might be something like the following:
-
-	Location			Unit
-	--------			----
-	HP-IB at 7, slave 2		2	(disk: rd2)
-	HP-IB at 14, slave 5		13	(disk: rd13)
-	SCSI at 16, slave 0		0	(disk: sd0)
-
-
-                   Miniroot installation via network
-	           ---------------------------------
-NOTE:  BOOTING SYS_INST VIA THE NETWORK IS ONLY POSSIBLE IF YOUR BOOTROM
+		   Ramdisk installation via network or CD-ROM
+	           ------------------------------------------
+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
-`.../install' directory of the distribution:
-
-	SYS_INST	The standalone disklabel and miniroot
-			installation tool
+`2.2/hp300' directory of the distribution:
 
-	inst-20.fs.gz	A gzipped miniroot filesystem image.  This image
-			must be un-gzipped before copying to disk.
+	SYS_UBOOT	The unified boot block file.
 
-To boot SYS_INST via the network, you will need a system capable of handling
-boot requests for an HP workstation.  If you will use this method, see the
-special note below.
+	bsd.rd		The gziped RAMDISK kernel image.
 
-To boot SYS_INST from tape, you need only place SYS_INST on the tape as
-the first file.
+To boot SYS_UBOOT via the network, you will need a system capable of
+handling boot requests for an hp300.  If you will use this method, see
+the special note below.
 
--- The following section is specific for loading SYS_INST via the network. --
+To boot from SCSI CD-ROM, simply insert the CD that is hp300 bootable into
+the drive before power up, then during the client's self-test cycle,
+press the space bar.  Shortly, you should see a menu of possible boot
+options appear.  Select the option corresponding to SYS_CDROM.
+SYS_UBOOT will then load and prompt you for a kernel name.
 
-If you wish to load the SYS_INST program via the network, you may need
-the following from the `.../install' directory in addition to the items
-listed above:
+-- The following section is specific for loading SYS_UBOOT via the network. --
 
-	rbootd.tar.gz	Source code for the rbootd program included with
-			OpenBSD.  It requires that the server have a
-			Berkeley Packet Filter (bpf).  You will need to
-			compile this version of rbootd if your server
-			system does not have this utility already.
+If you wish to load the SYS_UBOOT program via the network, you need to
+either have another OpenBSD system on the network, or something else
+capable of running the rbootd(8) program.  Source code may be found
+under usr.sbin/rbootd in the OpenBSD source tree, but requires the
+Berkeley Packet Filter (bpf) in order to function.  It may be possible to
+use HP-UX, but is not recommended (or documented here).
 
 First of all, configure your rbootd to handle boot requests from the
 client.  NOTE: OpenBSD's `rbootd' is slightly different from HP-UX's.
 To configure OpenBSD's `rbootd', create a file called `/etc/rbootd.conf'
 and place in it an entry like the following:
 
-	08:00:09:04:AA:33	SYS_INST	# thunder-egg
+	08:00:09:04:AA:33	SYS_UBOOT	# thunder-egg
 
 The first column is the ethernet address of the client's network interface.
 The second column is the program to send to the client, and anything after
-the `#' is a comment.  Once you have rbootd running, copy the SYS_INST
+the `#' is a comment.  Once you have rbootd running, copy the SYS_UBOOT
 program to the /usr/mdec/rbootd directory on your server.  If this
 directory doesn't exist already, you will need to create it.
 
@@ -89,76 +70,15 @@ manual page on your server system.
 
 Once `rbootd' is configured and running, you will be ready to continue.
 
+Make sure that the ramdisk kernel image (`bsd.rd') resides in a filesystem
+that is NFS exported to the client.  See the manual pages on your server
+system if you need more information about exporting filesystems.
+
+You are now ready to load SYS_UBOOT.  During the client's self-test cycle,
+press the space bar.  Shortly, you should see a menu of possible boot
+options appear.  Select the option corresponding to SYS_UBOOT.
+SYS_UBOOT will then load and prompt you for a kernel name.  NFS file
+names should not have a leading '/' prepended to them, simply use `bsd.rd'.
+
 ------------------ End of network boot-specific section ----------------------
 
-Make sure that the miniroot filesystem image has been un-gzipped, and
-that it resides in a filesystem what is exported to the client.  See the
-manual pages on your server system if you need more information about
-exporting filesystems.
-
-You are now ready to SYS_INST.  During the client's self-test cycle, press
-the space bar a few times.  Shortly, you should see a menu of possible boot
-options appear.  Select the option corresponding to SYS_INST.  SYS_INST will
-load and prompt you for a command.
-
-If this is a new OpenBSD installation, you will need to place a disklabel
-on the disk.
-
-	sys_inst> disklabel
-
-NOTE: it may be worth selecting the `zap' option initially to ensure that
-the disklabel area is clear.  This may be especially important if an
-HP-UX boot block had been previously installed on the disk.
-
-Select the `edit' option, and answer the questions about your disk.
-There may be several questions which you may not be sure of the answers
-to.  Listed below are guidelines for SCSI and HP-IB disks:
-
-	Bad sectoring?		NO
-	Ecc?			NO
-	Interleave?		1
-	Trackskew?		0
-	Cylinderskew?		0
-	Headswitch?		0
-	Track-to-track?		0
-	Drivedata 0-4?		0 (for all Drivedata values)
-
-Next, you will be asked to fill out the partition map.  You must provide
-responses for all 8 partitions.  Remember, you must allocate at least 6M
-for the `b' partition, or else the miniroot will not fit.  Set the size and
-offset of any unused partition to 0.  Note that sizes and offsets are
-expressed in `n sectors', assuming 512 byte sectors.  Care should be taken
-to ensure that partitions begin and end on cylinder boundaries (i.e. size
-and offset is an even multiple of the number of sectors per cylinder).
-While this is not technically necessary, it is generally encouraged.  Note
-that you cannot enter partition types at this time.  You will be given an
-oppotinuty to `clean up' the disklabel later on in the installation procedure.
-
-Once you have edited the label, select the `show' option to verify that
-it is correct.  If so, select `write' and `done'.  Otherwise, you may
-re-edit the label.
-
-The next step is to copy the miniroot image onto the target disk.
-
-	sys_inst> miniroot
-
-You will be prompted for the target disk and the source of the miniroot
-filesytem image.
-
-Enter the filename of the miniroot image.  Note that this file _must_ reside
-in the server directory being mounted.  Next you will be asked for the
-client's IP address, netmask, and default router, the server's IP address,
-and the directory on the server to mount.  Once you have entered this
-information, SYS_INST will attempt to mount the NFS server and begin copying
-the miniroot filesystem to the `b' partition of the target disk.
-
-Is is worth noting that this copy may take a while.  It might be worth
-grabbing a cup of coffee at this point.
-
-Once the miniroot filesystem image has been copied onto the target disk,
-you may boot from the miniroot filesystem.
-
-	sys_inst> boot
-
-Enter the disk from which to boot.  The kernel in the miniroot filesystem
-will be booted into single-user mode.
diff --git a/distrib/notes/hp300/upgrade b/distrib/notes/hp300/upgrade
index e01e5c692c9..febdd31fd78 100644
--- a/distrib/notes/hp300/upgrade
+++ b/distrib/notes/hp300/upgrade
@@ -1,90 +1,6 @@
-It is possible to easily upgrade your existing OpenBSD/hp300 system
-using the upgrade program in the miniroot.  If you wish to upgrade
-your system by this method, simply select the `upgrade' option once
-the miniroot has booted.  The upgrade program with then guide you
-through the procedure.  The upgrade program will:
+There is no upgrade mechanism supported by this release of OpenBSD/hp300,
+since it is the first official release for this architecture, and is not
+compatible with other operating systems.
 
-	* Enable the network based on your system's current
-	  network configuration.
-
-	* Mount your existing filesystems.
-
-	* Extract binary sets from the media of your choice.
-
-	* Fixup your system's existing /etc/fstab, changing the
-	  occurrences of `ufs' to `ffs' and let you edit the
-	  resulting file.
-
-	* Make new device nodes in your root filesystem.
-
-	* Copy a new kernel onto your root partition.
-	  NOTE: the existing kernel WILL NOT be backed up; doing
-	  so would be pointless, since a OpenBSD 1.0 kernel will
-	  not run OpenBSD 2.0 executables.
-
-	* Install a new boot block.
-
-	* Check your filesystems for integrity.
-
-While using the miniroot's upgrade program is the preferred method
-of upgrading your system, it is possible to upgrade your system
-manually.  To do this, follow the following procedure:
-
-	* Place _at least_ the `base' binary set in a filesystem
-	  accessible to the target machine.  A local filesystem
-	  is preferred, since there may be incompatibilities
-	  between the OpenBSD 2.0 kernel and older route(8)
-	  binaries.
-
-	* Back up your pre-existing kernel and copy the 2.0
-	  kernel into your root partition.
-
-	* Reboot with the 2.0 kernel into single-user mode.
-
-	* Check all filesystems:
-
-		/sbin/fsck -p
-
-	* Mount all local filesystems:
-
-		/sbin/mount -a -t nonfs
-
-	* If you keep /usr or /usr/share on an NFS server, you
-	  will want to mount those filesystems as well.  To do
-	  this, you will need to enable the network:
-
-		sh /etc/netstart
-
-	  NOTE: the route(8) commands may fail due to potential
-	  incompatibilities between route(8) and the OpenBSD 2.0
-	  kernel.  Once you have enabled the network, mount the
-	  NFS filesystems.  If you use amd(8), you may or may not
-	  have to mount these filesystems manually.  Your mileage
-	  may vary.
-
-	* Make sure you are in the root filesystem and extract
-	  the `base' binary set:
-
-		cd /
-		tar -xzvpf /path/to/base20.tar.gz
-
-	* Install a new boot block:
-
-		cd /usr/mdec
-		disklabel -B <root disk, e.g. sd0>
-
-	* Sync the filesystems:
-
-		sync
-
-	* At this point you may extract any other binary sets
-	  you may have placed on local filesystems, or you may
-	  wish to extract additional sets at a later time.
-	  To extract these sets, use the following commands:
-
-		cd /
-		tar -xzvpf <path to set>
-
-NOTE: you SHOULD NOT extract the `etc' set if upgrading.  Instead, you
-should extract that set into another area and carefully merge the changes
-by hand.
+Be sure to back up any important data from your system, and then do an
+install from scratch.
diff --git a/distrib/notes/hp300/whatis b/distrib/notes/hp300/whatis
index 777c5d527db..819bd6b0163 100644
--- a/distrib/notes/hp300/whatis
+++ b/distrib/notes/hp300/whatis
@@ -1,2 +1,2 @@
-This is the second public release of OpenBSD for the HP 9000/300 series of
+This is the first public release of OpenBSD for the HP 9000/300 series of
 computers.
diff --git a/distrib/notes/hp300/xfer b/distrib/notes/hp300/xfer
index 9113cb4d65b..9a9e37bb2fa 100644
--- a/distrib/notes/hp300/xfer
+++ b/distrib/notes/hp300/xfer
@@ -1,80 +1,93 @@
 Installation is supported from several media types, including:
+
+	Local FFS partitions
 	Tape
-	CD-ROM
-	NFS
+	Remote NFS partition
 	FTP
-
-The steps necessary to prepare the distribution sets
-for installation depend on which method of installation
-you choose.  The various methods are explained below.
-
-To prepare for installing via a tape:
-
-	If you wish to load SYS_INST from tape, it must
-	appear on the tape before any other files.  To copy
-	this onto tape, use a command like the following:
-
-		dd if=SYS_INST of=<tape_device> bs=20b
-
-	Note that not all HP BOOTROMs support booting from
-	SCSI tapes.
-
-	Copying the miniroot to disk from tape is not currently
-	supported.  However, it is planned for a future release.
-
-	If you wish to extract binary sets onto your disk from
-	tape, you must first place them on the tape.  The easiest
-	way to do this is with the dd(1) command.  Make sure you
-	use a `no-rewind-on-close' tape device.  For example:
-
-		for file in base20.tar.gz etc20.tar.gz; do
-			dd if=${file} of=/dev/nrst0 bs=20b
-		done
-
-	Note that depending on your tape drive, you may need to
-	explicitly set the EOF marker at the end of each file.
-	It may also be necessary to use the `conv=osync' argument
-	to dd(1).  Note that this argument is incompatible with the
-	`bs=' argument.  Consult the tape-related manual pages on the
-	system where the tapes are created for more details.
-
-To prepare for installing via NFS:
-
-	SYS_INST currently requires an NFS server from which to
-	copy the miniroot.
-
-		* This filesystem must be exported with root permissions,
-		  but may be exported read-only.
-
-		* The miniroot image _must_ reside in the `root' of the
-		  mounted filesystem.  For example, if the client system
-		  mounts `server:/u', then the miniroot image must reside
-		  in /u on the server.  This is due to limitations in the
-		  file lookup code used in SYS_INST, and may be fixed in
-		  a future release.
-
-		* If you also wish to install the binary sets from the
-		  NFS server, place them in a properly exported filesystem
-		  on the server.  Note that these files do not suffer from
-		  the same placement restrictions as the miniroot.
-
-To prepare for installing via FTP:
-
-	It is possible, using the `install' and `upgrade'
-	programs in the miniroot, to extract the binary sets
-	directly onto disk from an FTP server.  This is by far
-	the easiest installation method, as you may specify to
-	have all sets extracted at once, providing that they
-	are located in the same directory on the server.
-
-	All that is required in this case is that you have
-	network access to an FTP server.  This may be your
-	account on another system, or may even be ftp.OpenBSD.ORG
-	itself.  If you wish to use ftp.OpenBSD.ORG as your FTP
-	file server, you may want to keep the following information
-	handy:
-
-		IP Address: 205.149.163.23
-		Login: anonymous
-		Password: <your e-mail address>
-		Server path: /pub/OpenBSD/2.0/hp300/binary
+	HTTP
+	rsh & restore
+
+Obviously, the steps necessary to prepare the distribution sets for
+installation or upgrade depend on which installation medium you
+choose.  The steps for the various media types are outlined below.
+
+To install or upgrade OpenBSD using a tape, you need to do the
+following:
+
+	To install OpenBSD from a tape, you need to make a tape that
+	contains the distribution set files, in "tar" format.  If
+	you're making the tape on a UN*X-like system, the easiest way
+	to do so is probably something like:
+
+		tar cf <tape_device> <dist_directories>
+
+	where "<tape_device>" is the name of the tape device that
+	describes the tape drive you're using (possibly /dev/rst0, or
+	something similar, but it will vary from system to system.
+	(If you can't figure it out, ask your system administrator.)
+	In the above example, "<dist_directories>" are the
+	distribution sets' directories, for the distribution sets you
+	wish to place on the tape.  For instance, to put the "base22"
+	and "etc22" distributions on tape (in order to do the absolute
+	minimum installation to a new disk), you would do the
+	following:
+
+		cd .../2.2		# the top of the tree
+		cd hp300
+		tar cf <tape_device> base22.tar.gz etc22.tar.gz
+
+	(Note that you still need to fill in "<tape_device>" in the
+	example.)
+
+	Once you have the files on the tape, you can proceed to the
+	next step in the installation or upgrade process.  If you're
+	installing OpenBSD from scratch, go to the section on preparing
+	your hard disk, below.  If you're upgrading an existing
+	installation, go directly to the section on upgrading.
+
+To install or upgrade OpenBSD using a remote partition, mounted via
+NFS, you must do the following:
+
+	NOTE:	This method of installation is recommended only for
+		those already familiar with using BSD network
+		configuration and management commands.  If you aren't,
+		this documentation should help, but is not intended to
+		be all-encompassing.
+
+	Place the OpenBSD distribution sets you wish to install into a
+	directory on an NFS server, and make that directory mountable
+	by the machine on which you are installing or upgrading OpenBSD.
+	This will probably require modifying the /etc/exports file on
+	of the NFS server and resetting its mount daemon (mountd).
+	(Both of these actions will probably require superuser
+	privileges on the server.)
+
+	You need to know the the numeric IP address of the NFS server,
+	and, if the server is not on a network directly connected to
+	the machine on which you're installing or upgrading OpenBSD,
+	you need to know the numeric IP address of the router closest
+	to the OpenBSD machine.  Finally, you need to know the numeric
+	IP address of the OpenBSD machine itself.
+
+	Once the NFS server is set up properly and you have the
+	information mentioned above, you can proceed to the next step
+	in the installation or upgrade process.  If you're installing
+	OpenBSD from scratch, go to the section on preparing your hard
+	disk, below.  If you're upgrading an existing installation, go
+	directly to the section on upgrading.
+
+If you are upgrading OpenBSD, you also have the option of installing
+OpenBSD by putting the new distribution sets somewhere in your existing
+file system, and using them from there.  To do that, you must do the
+following:
+
+	Place the distribution sets you wish to upgrade somewhere in
+	your current file system tree.  At a bare minimum, you must
+	upgrade the "base" binary distribution, and so must put the
+	"base22" set somewhere in your file system.  If you wish,
+	you can do the other sets, as well, but you should NOT upgrade
+	the "etc" distribution; the "etc" distribution contains system
+	configuration files that you should review and update by hand.
+
+	Once you have done this, you can proceed to the next step in
+	the upgrade process, actually upgrading your system.