- update supported hardware list

- harmonize installation text with other arches (getting boring)
- don't tryp to scare people in the description of the port (rough edges?
  come on, come on, almost none)
- add more installation methods (more to come, for rainy days)

5 files changed, 120 insertions, 64 deletions

diff --git a/distrib/notes/vax/hardware b/distrib/notes/vax/hardware
index e84582239eb..8305e17fe21 100644
--- a/distrib/notes/vax/hardware
+++ b/distrib/notes/vax/hardware
@@ -1,10 +1,11 @@
-OpenBSD/vax OSREV runs on a wide variety of VAX hardware, although only
+OpenBSD/MACHINE OSREV runs on a wide variety of VAX hardware, although only
 the following systems have been tested:
 	- VAXstation/MicroVAX 2000
 	- VAXstation 3100/{30,40}
 	- VAXstation 3100/{38,48}
 	- VAXstation 3100/76
 	- VAXstation 4000/60
+	- VAXstation 4000/VLC
 	- MicroVAX 3100/{10,20}{,e}
 	- MicroVAX 3100/80
 	- MicroVAX 3100/90
@@ -28,6 +29,6 @@ Serial ports:
 The lowest amount of memory tested is 6M; however, more is recommended.
 At the moment, the only supported console is a serial console.
 
-Currently, your only storage options for using OpenBSD/vax are SCSI 
+Currently, your only storage options for using OpenBSD/MACHINE are SCSI 
 disks or tapes on one of the supported controllers, or a NFS root and 
 swap.  Please see below for details.
diff --git a/distrib/notes/vax/install b/distrib/notes/vax/install
index 8a265b4a405..5936cdeb305 100644
--- a/distrib/notes/vax/install
+++ b/distrib/notes/vax/install
@@ -1,6 +1,6 @@
 OpenBSDInstallPrelude
 
-For most systems, the easiest way to install OpenBSD/vax OSREV is via
+For most systems, the easiest way to install OpenBSD/MACHINE OSREV is via
 diskless booting over an Ethernet network.  You will need both the
 "boot.mop" image and the "bsd.rd" kernel to boot.  You will also need a
 machine configured as a rarp, MOP, bootparam, and NFS server.
@@ -19,19 +19,18 @@ rpc.bootparamd(8), bootparams(5), and diskless(8). These pages are
 available online at: <http://www.openbsd.org/cgi-bin/man.cgi>
 
 Brian Chase <bdc@world.std.com> has written a guide for booting a VAX
-off of a network.  It was written for NetBSD/vax, but the procedure is
+off of a network.  It was written for NetBSD/MACHINE, but the procedure is
 virtually identical on OpenBSD, and the document covers the use of
 several different platforms as servers.
  
 The guide is available at:
 <http://world.std.com/~bdc/projects/vaxen/VAX-netboot-HOWTO>
  
-And finally, there is an OpenBSD/vax mailing list at <vax@openbsd.org>
+And finally, there is an OpenBSD/MACHINE mailing list at <vax@openbsd.org>
 whose readers would generally be pleased to help.
 
 
-Configuring the Server:
------------------------
+Booting from Network:
 
 When you turn on your VAX, it will run a set of self-diagnostic ROM routines.
 Depending on the model of VAX you have, it may take quite a while.  When 
@@ -40,10 +39,10 @@ console.  Typing "show dev" or "show ethernet" to get the VAX ethernet
 device's MAC address usually works; also try "TEST 50" on MicroVAXen 2000
 and 3100.
 
-You will need to create an /etc/ethers file.  This file is used by rarpd to 
-answer rarp (ethernet address->IP address) requests.  The format of this file 
-is the ethernet address followed by the machine name or address.  Here is an 
-example:
+You will need to create an /etc/ethers file on the bootserver.  This file
+will be used by rarpd to answer rarp (ethernet address->IP address) requests.
+The format of this file is the ethernet address followed by the machine
+name or address.  Here is an example:
 
 08:00:2b:24:72:00		quickvax
 
@@ -66,25 +65,39 @@ Make a separate directory for your VAX's /, make sure it is exported via NFS,
 and place "bsd.rd" there.
 
 Typing "B <DEVICE>", where <DEVICE> is your VAX's ethernet device, at the 
-chevron prompt should then load the OpenBSD booter.  A countdown should begin;
-type any key on the console and type "boot bsd.rd".  
+chevron prompt should then load the OpenBSD booter.
 
 OpenBSDInstallPart2
 
+	After setting up your bootserver, boot from it as described above.
+
+	The OpenBSD bootloader will appear, and a countdown should begin;
+	type any key on the console and type "boot bsd.rd".  
+
+	It will take a while to load the kernel especially on a slow
+	machine, or from a slow network connection, most likely more than
+	a minute.  If some action doesn't eventually happen, or the
+	spinning cursor has stopped and nothing further has happened,
+	either your diskless setup is incorrect, or you may have a
+	hardware or configuration problem.
+
+
 OpenBSDBootMsgs
 
-	You will next be asked for your terminal type.  If you are
-	installing from a keyboard/monitor console, choose vt220.
+	You will next be asked for your terminal type.
 	If you are installing from a serial console you should choose
 	the terminal type from amongst those listed.
 	(If your terminal type is xterm, just use vt100).
 
-	After entering the terminal type you will be greeted by a
-	welcome message and asked if you really want to continue.
-	Assuming you answered yes, the install program will then tell
-	you which disks of that type it can install on, and ask you
-	which it should use.  The name of the disk is typically "sd0".
-	Reply with the name of your disk.
+	After entering the terminal type you will be asked whether you
+	wish to do an "(I)nstall" or an "(U)pgrade".  Enter 'I' for a
+	fresh install or 'U' to upgrade an existing installation.
+	
+	You will be presented with a welcome message and asked if
+	you really want to continue. Assuming you answered yes, the
+	install program will then tell you which disks of that type
+	it can install on, and ask you which it should use.  The name
+	of the disk is typically "sd0". Reply with the name of your disk.
 
 	Next you will have to edit or create a disklabel for the disk
 	OpenBSD is being installed on.  The installation script will
@@ -156,6 +169,10 @@ OpenBSDFTPInstall
 
 OpenBSDHTTPInstall
 
+OpenBSDTAPEInstall
+
+OpenBSDCDROMInstall
+
 OpenBSDNFSInstall
 
 OpenBSDDISKInstall(,{:-only-:})
diff --git a/distrib/notes/vax/prep b/distrib/notes/vax/prep
index 0b1609f5621..a86587a13f6 100644
--- a/distrib/notes/vax/prep
+++ b/distrib/notes/vax/prep
@@ -1,4 +1,4 @@
 VAX machines don't generally need any specific preparation. It's worth
-noting, however, that OpenBSD/vax currently requires a serial console,
+noting, however, that OpenBSD/MACHINE currently requires a serial console,
 so on systems with graphics support (such as VAXstations), you may have
 to flip a switch in order to yield this behaviour.
diff --git a/distrib/notes/vax/whatis b/distrib/notes/vax/whatis
index 870eff4e421..61102d2a0af 100644
--- a/distrib/notes/vax/whatis
+++ b/distrib/notes/vax/whatis
@@ -1,9 +1,5 @@
-OpenBSD/vax OSREV is a port to the VAX series of machines, formerly
+OpenBSD/MACHINE OSREV is a port to the VAX series of machines, formerly
 manufactured by Digital Equipment Corporation.
 
-This port is still fairly recent, and for this reason it is still quite
-"rough", although many areas are greatly improved since the previous
-release.
-
 Development is ongoing, and support for a greater variety of hardware
 as well as new features is in the works.
diff --git a/distrib/notes/vax/xfer b/distrib/notes/vax/xfer
index 6075e277e6d..f96c1da64de 100644
--- a/distrib/notes/vax/xfer
+++ b/distrib/notes/vax/xfer
@@ -1,53 +1,95 @@
 Installation is supported from several media types, including:
 
 	FFS partitions
+	Tape
 	Remote NFS partition
+	CD-ROM
 	FTP
 	HTTP
 
-To install or upgrade OpenBSD using a remote partition, mounted via
+
+The steps necessary to prepare the distribution sets for installation
+depend on which method of installation you choose.  Some methods
+require a bit of setup first that is explained 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, each in "tar" format or
+	in "gzipped tar format".  First you will need to transfer the
+	distribution sets to your local system, using ftp or by mounting
+	the CD-ROM containing the release.  Then you need to make a tape
+	containing the files.
+
+	If you're making the tape on a UN*X-like system, the easiest way
+	to do so is make a shell script along the following lines, call it
+	"/tmp/maketape".
+
+	#! /bin/sh
+	tape=/dev/nrst0
+	mt -f ${tape} rewind
+	for file in base etc comp game man misc xbase xfont xserv xshare
+	do
+		dd if=${file}OSrev.tgz of=${tape} obs=8k conv=sync
+	done
+	tar cf ${tape} bsd
+	mt -f ${tape} offline
+	# end of script
+
+
+	And then:
+
+	cd .../OSREV/sparc
+	sh -x /tmp/maketape
+
+	If you're using a system other than OpenBSD or SunOS, the tape
+	name and other requirements may change.
+
+
+To install 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 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.	
+	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 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
-    "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.
+	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
+	"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.
 
-    Once you have done this, you can proceed to the next step in
-    the upgrade process, actually upgrading your system.
+	Once you have done this, you can proceed to the next step in
+	the upgrade process, actually upgrading your system.