A few clarifications, and more third-person text.

4 files changed, 80 insertions, 88 deletions

diff --git a/distrib/notes/mvme68k/contents b/distrib/notes/mvme68k/contents
index 19cc232f7d4..34cac8e8dcd 100644
--- a/distrib/notes/mvme68k/contents
+++ b/distrib/notes/mvme68k/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.20 2003/03/25 19:57:31 miod Exp $
+dnl	$OpenBSD: contents,v 1.21 2003/06/21 01:06:00 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -18,7 +18,7 @@ OpenBSDrd
 				S-records format.
 		stboot		A VID tape block.
 
-These files can be used to make a boot tape suitable for installation.
+These files can be used to make a bootable 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.
diff --git a/distrib/notes/mvme68k/hardware b/distrib/notes/mvme68k/hardware
index 83ad3b2e18b..270a3121b2a 100644
--- a/distrib/notes/mvme68k/hardware
+++ b/distrib/notes/mvme68k/hardware
@@ -1,9 +1,10 @@
-dnl	$OpenBSD: hardware,v 1.10 2002/06/09 05:53:54 todd Exp $
+dnl	$OpenBSD: hardware,v 1.11 2003/06/21 01:06:00 miod Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- MVME147 - Motorola with 68030 and 68881
-	- MVME162 - Motorola with 68040
+	- MVME162 - Motorola with 68040 and IndustryPack slots
 	- MVME167 - Motorola with 68040
-	- MVME172 - Motorola with 68060
+dnl 172 support is not complete
+dnl	- MVME172 - Motorola with 68060 and IndustryPack slots
 	- MVME177 - Motorola with 68060
 
 The minimal configuration requires 8M of RAM and ~100M of disk space. To
@@ -18,11 +19,9 @@ MVME147:
 	serial ports:
 		on-board ttya-ttyd
 	ethernet:
-		on-board AMD 7990 Lance ethernet ("le0")
+		on-board AMD 7990 Lance ethernet (le)
 	SCSI:
 		on-board WD33C93 controller
-	parallel:
-		a driver exists, but it is not integrated.
 	VMEbus:
 		not supported (some cards have issues)
 
@@ -30,32 +29,28 @@ MVME162, MVME172:
 	serial ports:
 		on-board tty00-03 - Zilog Z85230 SCC
 	ethernet:
-		on-board Intel 82596CA ethernet ("ie0")
+		on-board Intel 82596CA ethernet (ie)
 	SCSI:
 		on-board NCR53c710 controller
-	VME:
-		drivers for short I/O access
+	VMEbus:
+		drivers for short I/O access (untested)
 	Flash:
 		1 MB flash, either Intel 28F008SA or 28F020
-		driver is available, but doesn't work
+		A driver is available, but doesn't work correctly.
 		Jumper GPIO3 selects Flash memory map and must
 		be installed for booting with the Flash driver (default)
 	SRAM:
 		supported
-	VMEbus:
-		untested
-	IP:
+	IndustryPack:
 		untested
 
 MVME167, MVME177:
-	serial:
+	serial ports:
 		on-board tty00 - tty03 - Cirrus Logic CD2401
 	ethernet:
-		on-board Intel 82596CA ethernet ("ie0")
+		on-board Intel 82596CA ethernet (ie)
 	SCSI:
 		on-board NCR53c710 controller
-	parallel:
-		not supported
 	SRAM:
 		supported
 	VMEbus:
@@ -64,8 +59,8 @@ MVME167, MVME177:
 
 Faithful clones of the above boards should also work.
 
-Additional VMEbus devices {:-include-:}:
+Additional VMEbus devices supported by the OpenBSD/MACHINE port {:-include-:}:
 
-	MVME328 SCSI controller ("vs")
+	MVME328 SCSI controller (vs)
 
-	MVME376 VME bus ethernet ("le*")
+	MVME376 VME bus ethernet (le)
diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install
index 27c8b6add54..d54c0e04d7c 100644
--- a/distrib/notes/mvme68k/install
+++ b/distrib/notes/mvme68k/install
@@ -1,37 +1,38 @@
-dnl	$OpenBSD: install,v 1.19 2003/06/21 00:32:59 pvalchev Exp $
+dnl	$OpenBSD: install,v 1.20 2003/06/21 01:06:00 miod Exp $
 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
 be booted from tape.
 
-Alternatively, if your MACHINE is hooked up in a network 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.
+Alternatively, if the MACHINE is hooked up in a network, it is possible
+to setup another machine as a server for 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).
 
 
 Booting from the Installation Media:
 
-Prior to attempting an installation, you should make sure that everything
-of value on the target system has been backed up.  While installing OpenBSD
-does not necessarily wipe out all the partitions on the hard disk, errors
-during the install process can have unforeseen consequences and you will
-probably render the system unbootable if you start, but do not complete
-the installation.  Having the installation media for the prior installation,
-like a Motorola SystemV/MACHINE tape is good insurance if you want to be
-able to "go back" for some reason.
+Prior to attempting an installation, everything of value on the target
+system should be backed up.  While installing OpenBSD does not necessarily
+wipe out all the partitions on the hard disk, errors during the install
+process can have unforeseen consequences and will probably leave the system
+unbootable if the installation process is not completed. Availability
+of the installation media for the prior installation, such as a Motorola
+SystemV/MACHINE tape is always a good insurance, should it be necessary
+to "go back" for some reason.
 
-After taking care of all that, bring your system down gracefully using
-the shutdown(8) and/or halt(8) commands.  This will get you to the BUG
-prompt.
+After taking care of all that, the system should be brought down gracefully
+using the shutdown(8) and/or halt(8) commands, which will eventually go
+bakc to the ``BUG>'' prompt (it may be necessary to send a break if the
+system is completely halted).
 
 
 Booting from SCSI tape:
 
-After creating the boot tape, boot it by typing the appropriate command
-at the PROM:
+Bootable tapes can be booted with the following command at the prompt:
 
 	167-bug> bo xx yy
 
@@ -48,52 +49,55 @@ for any other MACHINE board.
 
 Installing using a diskless setup:
 
-First, you must setup a diskless client configuration on a server. If
-you are using a OpenBSD system as the boot-server, have a look at the
-diskless(8) manual page for guidelines on how to proceed with this.
-If the server runs another operating system, you'll have to consult
-documentation that came with it (on SunOS systems, add_client(8) and
-the Sun System/Networks administrators guide constitute a good start;
-on Solaris systems, share(1M) is a good starting point as well).
-
-You should then setup your workstation using the NIOT command at the BUG
-prompt. The Load Address should be 0x3F0000, and the Execution Address
-should be 0x3F0000 as well. You may now boot your workstation from the
-server by entering the NBO command at the BUG prompt:
+First, a diskless client configuration should be setup on a server. If
+the boot server is an OpenBSD system, the diskless(8) manual page will
+provide detailed information on the process.
+
+If the server runs another operating system, the setup instructions will
+likely be available as part of the documentation that came with it (on
+SunOS systems, add_client(8) and the Sun System/Networks administrators
+guide constitute a good start; on Solaris systems, share(1M) is a good
+starting point as well).
+
+Second, the MACHINE workstation should then be setup using the NIOT command
+at the BUG prompt. The ``Load Address'' value should be 0x3F0000, and the
+``Execution Address'' value should be 0x3F0000 as well.
+
+Then, it should be possible to boot the machine from the server by entering
+the NBO command at the BUG prompt:
 	
 	167-bug> nbo 00 00 bsd.rd
 
-If your BUG version does not understand the NIOT and NBO commands (most
-MVME147 don't), you will have to boot via S-Records.
+If the BUG version does not understand the NIOT and NBO commands (most
+MVME147 don't), the alternative is to boot from S-Records.
 
 
 Booting from S-Records:
 
-First, you must setup a diskless client configuration on a server. If
-you are using a OpenBSD system as the boot-server, have a look at the
-diskless(8) manual page for guidelines on how to proceed with this.
-If the server runs another operating system, you'll have to consult
-documentation that came with it (on SunOS systems, add_client(8) and
-the Sun System/Networks administrators guide constitute a good start;
-on Solaris systems, share(1M) is a good starting point as well).
+First, a diskless client configuration should be setup on a server. Refer
+to the short description above for details.
 
-Second, make sure you use a terminal emulator able to read files from the
-local machine and send their contents over the serial link. OpenBSD ships
-with both cu(1) and tip(1), but others can be used.
+Second, using a terminal emulator able to read files from the local machine
+and send their contents over the serial link, such as cu(1) and tip(1) - both
+being available on OpenBSD - the MACHINE workstation should be put in
+S-Records receive mode, with the LO command at the BUG prompr:
 
-After reseting your MACHINE board, enter "LO" at the BUG prompt. If you get
-an error message, switch directories (enter "SD") and retry. The MACHINE
-should be awaiting a S-Record program now.
+	147-bug> LO
 
-From your terminal emulator, send the contents of the ``sboot'' file over
-the line. Depending on the speed of the serial link, this will take some
+If this command prints an error messages and returns to the BUG prompt
+immediately, it might be necessary to switch directories, using the SD
+command, before retrying.
+
+Then, the contents of the ``sboot'' file should be sent From the terminal
+emulator. Depending on the speed of the serial link, this will take some
 time, but no more than a couple of minutes.
 
-If you don't get a prompt back after a few minutes, send a break, reset
-your MACHINE board, and retry.
+If a prompt does not come back after a few minutes, it is likely that the
+S-Records download is hosed. In this case, the MACHINE board should be reset
+before a further attempt to download the S-Records is made.
 
-When the transfer is finished, enter "GO" at the BUG prompt.  The S-Records
-boot loader will start.  This is a very crude bootloader which will attempt
+Once the transfer is finished, entering GO at the BUG prompt will start the
+S-Records boot loader. This is a very crude bootloader which will attempt
 to fetch a secondary boot program via TFTP requests, like the NBO command.
 
 This will cause the kernel provided by the diskless setup to be booted.
@@ -108,22 +112,15 @@ OpenBSDInstallPart2
 
 	Boot your machine from the installation media as described above.
 
-	It will take a while to load the kernel especially from a floppy
-	or 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 boot media
-	is bad, your diskless setup isn't correct, or you may have
-	a hardware or configuration problem.
+	It will take a while to load the kernel especially 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 boot media is bad, your
+	diskless setup isn't correct, or you may have a hardware or
+	configuration problem.
 
 OpenBSDBootMsgs
 
-	While booting, you will probably see several warnings.  You
-	may be warned that the kernel can't figure out what device
-	it booted from.  Do not be alarmed, this is completely normal.
-	This warning occurs because while OpenBSD/MACHINE can boot from
-	the floppy drive, the kernel itself lacks a floppy driver for some
-	MACHINE models.
-
 	You will next be asked for your terminal type.  You should choose
 	the terminal type from amongst those listed.
 	(If your terminal type is xterm, just use vt100).
diff --git a/distrib/notes/mvme68k/whatis b/distrib/notes/mvme68k/whatis
index b55821cae7e..913b11f8fd3 100644
--- a/distrib/notes/mvme68k/whatis
+++ b/distrib/notes/mvme68k/whatis
@@ -1,6 +1,6 @@
+dnl	$OpenBSD: whatis,v 1.6 2003/06/21 01:06:00 miod Exp $
 OpenBSD/MACHINE OSREV was written under contract for Willowglen Singapore
 for an embedded application.  Theo de Raadt, Dale Rahn, Chuck Cranor,
 and Steve Murphree were involved in working on this port which runs on
-the MVME147, MVME162, MVME167, MVME172, MVME177 and perhaps other models
-also.
+the MVME147, MVME162, MVME167, MVME177 and perhaps other models also.