General cleanup and updates here too, ok deraadt@

5 files changed, 71 insertions, 38 deletions

diff --git a/distrib/notes/mvme68k/contents b/distrib/notes/mvme68k/contents
index bad42920f91..3860d3d334d 100644
--- a/distrib/notes/mvme68k/contents
+++ b/distrib/notes/mvme68k/contents
@@ -6,6 +6,22 @@ OpenBSDbsd
 
 OpenBSDrd
 
+		installboot	The OpenBSD/MACHINE boot loader
+				installation program.
+		bootxx		The OpenBSD/MACHINE boot block.
+		bootsd		The OpenBSD/MACHINE disk boot loader.
+		bootst		The OpenBSD/MACHINE tape boot loader.
+		rboot		A standalone bootrom for the MVME147, in
+				S-records format.
+		sboot		A network bootloader for the MVME147, in
+				S-records format.
+		stboot		A VID tape block.
+
+These files can be used to make a boot tape suitable for installation.
+They 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 more information.
+
 DistributionDescription
 
 OpenBSDbase(11.2M,33.9M)
@@ -25,4 +41,3 @@ OpenBSDxbase
 OpenBSDxfont
 
 OpenBSDxserv
-
diff --git a/distrib/notes/mvme68k/hardware b/distrib/notes/mvme68k/hardware
index 9b0eb76956c..528fb62008a 100644
--- a/distrib/notes/mvme68k/hardware
+++ b/distrib/notes/mvme68k/hardware
@@ -6,10 +6,10 @@ OpenBSD/MACHINE OSREV runs on the following classes of machines:
 
 The minimal configuration requires 4M of RAM and ~60M of disk space.
 To install the entire system requires much more disk space, and to 
-compile the system, more RAM is recommended.  (OpenBSD with 4M of
-RAM feels like Solaris with 4M of RAM.) Note that until you have
+compile the system, more RAM is recommended (OpenBSD with 4M of
+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.)
+faster CPU).
 
 Supported devices {:-include-:}:
 
@@ -23,7 +23,7 @@ MVME147:
 	SCSI:
 		on-board 
 
-	Parallel:
+	parallel:
 		a driver exists, but it is not integrated.
 
 MVME162:
@@ -32,14 +32,10 @@ MVME162:
 
 	ethernet:
 		on-board Intel 82596CA ethernet ("ie0")
-		MVME376 VME bus ehternet ("le*")
 
 	SCSI:
 		on-board SCSI controller NCR53c710
 
-	Parallel:
-		Not available for this board
-
 	VME:
 		drivers for short I/O access
 
@@ -58,16 +54,15 @@ MVME162:
 	IP:
 		untested
 
-MVME167
+MVME167:
 	serial:
 		on-board tty00 - tty03 - Cirrus Logic CD2401
 	ethernet: 
 		on-board Intel 82596CA ethernet ("ie0")
-		MVME376 VME bus ehternet ("le*")
 	SCSI: 
 		on-board SCSI controller NCR53c710
 
-	Parallel:
+	parallel:
 		Not supported
 
 	SRAM:
@@ -76,16 +71,17 @@ MVME167
 	VMEbus:
 		supported
 		
-MVME177
+MVME177:
 	serial:
 		on-board tty00 - tty03 - Cirrus Logic CD2401
+
 	ethernet: 
 		on-board Intel 82596CA ethernet ("ie0")
-		MVME376 VME bus ehternet ("le*")
+
 	SCSI: 
 		on-board SCSI controller NCR53c710
 
-	Parallel:
+	parallel:
 		Not supported
 
 	SRAM:
@@ -94,3 +90,9 @@ MVME177
 	VMEbus:
 		supported
 		
+
+Additional VMEbus devices {:-include-:}:
+
+	MVME328 SCSI controller ("vs")
+
+	MVME376 VME bus ethernet ("le*")
diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install
index 4443bb43f58..d1895a3e44c 100644
--- a/distrib/notes/mvme68k/install
+++ b/distrib/notes/mvme68k/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 can
@@ -92,7 +91,7 @@ A few configuration files need to be edited:
 			server:/export/root/client       /     nfs  rw 0 0
 			server:/export/exec/sun4.OpenBSD /usr  nfs  rw 0 0
 
-Now you must populate the the `/dev' directory for your client. If you server
+Now you must populate the `/dev' directory for your client. If you server
 runs SunOS 4.x, you can simply change your working directory to `<root>/dev'
 and run the MAKEDEV script: `sh MAKEDEV all'.
 
@@ -160,30 +159,34 @@ the editor), then try setting it to `8 partitions:'.
 
 <BEGIN SAMPLE DISKLABEL SCREEN>
 OpenBSD# disklabel sd2
- # /dev/rsd2c:
-type: SCSI 
+# /dev/rsd2c:
+type: SCSI
 disk: SCSI disk
 label: Hold Your Breath
 flags:
 bytes/sector: 512
-sectors/track: 64
-tracks/cylinder: 7  
-sectors/cylinder: 448
-cylinders: 1429
+sectors/track: 124
+tracks/cylinder: 8
+sectors/cylinder: 992
+cylinders: 4177
+total sectors: 4165271
 rpm: 3600
 interleave: 1
 trackskew: 0
 cylinderskew: 0
-headswitch: 0           # milliseconds
-track-to-track seek: 0  # milliseconds
+headswitch: 0           # microseconds
+track-to-track seek: 0  # microseconds
 drivedata: 0
 
 8 partitions:
 #        size   offset    fstype   [fsize bsize   cpg]
-  a:    50176        0    4.2BSD        0     0     0   # (Cyl.    0 - 111)
-  b:    64512    50176      swap                        # (Cyl.  112 - 255)
-  c:   640192        0   unknown                        # (Cyl.    0 - 1428)
-  d:   525504   114688    4.2BSD        0     0     0   # (Cyl.  256 - 1428)
+  a:    80000        0    4.2BSD     1024  8192    16   # (Cyl.    0 - 80*)
+  b:   256000    80000      swap                        # (Cyl.   80*- 338*)
+  c:  4165271        0    unused        0     0         # (Cyl.    0 - 4198*)
+  d:  3229271   936000    4.2BSD     1024  8192    16   # (Cyl.  943*- 4198*)
+  f:   100000   336000    4.2BSD     1024  8192    16   # (Cyl.  338*- 439*)
+  g:   100000   436000    4.2BSD     1024  8192    16   # (Cyl.  439*- 540*)
+  h:   400000   536000    4.2BSD     1024  8192    16   # (Cyl.  540*- 943*)
 <END SAMPLE DISKLABEL SCREEN>
 
 
@@ -214,6 +217,21 @@ The installation script goes through the following phases:
 	- extraction of the distribution tar files
 	- installation of boot programs
 
+OpenBSDFTPInstall
+
+OpenBSDHTTPInstall
+
+OpenBSDTAPEInstall
+
+OpenBSDNFSInstall
+
+OpenBSDDISKInstall(,{:-only-:})
+
+OpenBSDCommonFS
+
+OpenBSDCommonURL
+
+After completing an installation:
 
 Now try a reboot.  (If needed, swap your scsi id's first).  Initially
 I'd suggest you "bo bsd -bs", then try multiuser after that.
diff --git a/distrib/notes/mvme68k/upgrade b/distrib/notes/mvme68k/upgrade
index 0842326c507..81ae6caa65e 100644
--- a/distrib/notes/mvme68k/upgrade
+++ b/distrib/notes/mvme68k/upgrade
@@ -1,6 +1 @@
-To upgrade to OpenBSD OSREV from a previous version follow the instructions
-in the section "Installing OpenBSD", but run the script `upgrade.sh'
-in stead of `install.sh'.
-
-The upgrade script will use the existing disk partitions to install the
-new system in, and also preserves the files in `/etc'.
+OpenBSDUpgrade
diff --git a/distrib/notes/mvme68k/xfer b/distrib/notes/mvme68k/xfer
index 221c6cb9f4a..24076e049e5 100644
--- a/distrib/notes/mvme68k/xfer
+++ b/distrib/notes/mvme68k/xfer
@@ -1,7 +1,10 @@
 Installation is supported from several media types, including:
-	NFS partitions
-	FTP
+
+	FFS partitions
 	Tape
+	Remote NFS partitions
+	FTP
+	HTTP
 
 The steps necessary to prepare the distribution sets
 for installation depend on which method of installation