Update supported hardware list, fix typos, use m4.common macros

whenever possible, remove obsolete information, etc.

ok fries@

7 files changed, 83 insertions, 161 deletions

diff --git a/distrib/notes/sun3/contents b/distrib/notes/sun3/contents
index 951c08ac571..ea13e8f6253 100644
--- a/distrib/notes/sun3/contents
+++ b/distrib/notes/sun3/contents
@@ -20,15 +20,14 @@ the OpenBSD System onto Useful Media" for instructions on either method.
 
 DistributionDescription
 
-OpenBSDbase(19.4,61.9M)
+OpenBSDbase(21.1M,63.6M)
 
-OpenBSDcomp(13.1M,40.6M)
+OpenBSDcomp(14.2M,42.0M)
 
-OpenBSDetc(988K,3.2M)
+OpenBSDetc(1.0M,3.2M)
 
-OpenBSDgame(2.6M,6.4M)
+OpenBSDgame(2.8M,6.6M)
 
-OpenBSDman(4.8M,18.4M)
-
-OpenBSDmisc(1.6M,5.5M)
+OpenBSDman(5.4M,19.5M)
 
+OpenBSDmisc(1.7M,5.6M)
diff --git a/distrib/notes/sun3/hardware b/distrib/notes/sun3/hardware
index db348b60287..71bc0fdd9c4 100644
--- a/distrib/notes/sun3/hardware
+++ b/distrib/notes/sun3/hardware
@@ -1,16 +1,18 @@
 OpenBSD/sun3 OSREV runs on most Sun3 machines, including:
-		3/50, 3/60, 3/110
-		3/75, 3/140, 3/150, 3/160, 3/180
-		3/260, 3/280
+		3/50
+		3/60, 3/60LE
+		3/75, 3/110, 3/1[4568]0
+		3/2[68]0
 
-OpenBSD/sun3 OSREV does not run on the Sun3/80  and Sun3/4x0 (sun3x
+OpenBSD/sun3 OSREV does not run on the Sun 3/80 and Sun 3/4x0 (sun3x
 class) because the sun3x MMU and other devices are very different.
 
 The minimal configuration requires 4M of RAM and ~80MB of disk space.
-To install the entire system requires much more disk space (approx.
-100MB additional space is necessary for full sources).  To run X
-or compile the system, more RAM is recommended.  Good performance
-requires 8MB of RAM, or 16 MB when running the X Window System.
+To install the entire system requires much more disk space (at least
+200MB is recommended, without counting the additional space necessary
+for sources or packages). To run X or compile the system, more memory
+is recommended. Acceptable performance requires 8MB of RAM, or 16 MB
+when running the X Window System.
 
 The following Sun3 hardware is supported:
 
@@ -28,9 +30,9 @@ The following Sun3 hardware is supported:
 		On-board "si" (SCSI-3)
 		VME "si" (SCSI-3) board
 
-	SMD Disks:  (the big, heavy ones)
+	SMD Disks Controlers:
 		Xylogics 450/451
-		Xylogics 753/7053
+		Xylogics 750/7053
 
 	Input devices:
 		Sun keyboard and mouse
@@ -38,4 +40,4 @@ The following Sun3 hardware is supported:
 	Miscellaneous:
 		Battery-backed real-time clock.
 
-If it's not on this list, there is no support for it in this release.
+Hardware not listed here is likely to be unsupported by this release.
diff --git a/distrib/notes/sun3/install b/distrib/notes/sun3/install
index 37b2b2375a5..507b1f2d170 100644
--- a/distrib/notes/sun3/install
+++ b/distrib/notes/sun3/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 miniroot that can
@@ -16,24 +15,6 @@ system, using SunOS tools and gnu tar and gunzip (see ``Installing from
 SunOS'' below).
 
 
-This section of the install document is really broken into several parts:
-
-	- booting from the installation media
-	- the miniroot install script
-	- after completing an installation
-	- installing from Sun OS
-	- net boot or diskless setup information
-
-The first section explains how to run tho install scripts. The second
-section gets you up to the point where you've booted the kernel from
-whatever media or setup described in the previous section, to where you
-have to respond to prompts from the install script.  The next section
-describes the path through the install script, and the remainder are
-notes which might be useful, but outside the bounds of simple "how to"
-instructions.
-
-
-
 Booting from the Installation Media:
 
 Prior to attempting an installation, you should make sure that everything
@@ -67,7 +48,7 @@ install or upgrade procedure. Proceed to the section ``Running the
 installation scripts'' below.
 
 
-Installing using a diskless setup
+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
@@ -92,68 +73,56 @@ scripts'' below.
 In order to have a sun3 machine boot diskless by default, you need to
 do some nvram wizardry:
 
-	> q
-	18
+	> q 18
 	12
+then, if your machine is a model 3/50 or 3/60, continue with:
 	6c
 	65
 	00
 	00
 	00
+or, for other sun3 machines:
+	69
+	65
+	00
+	00
+	00
+and return to the prom prompt with:
 	q
 	>
 
-The miniroot install script:
+The above set of commands has changed the boot path strategy to the
+network interface, thus a diskless boot.
+To change the strategy in diagnostic mode (when the "Diag/Norm" switch
+is set to "Diag"), enter the same set of data after a "q 22" command
+instead of "q 18".
+Remember that the prom having a limited number of write cycles, you
+shouldn't abuse this feature.
 
-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 may have to begin the installation
-process again from scratch.  Using Control-Z to suspend the process
-may be a better option. 
+
+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
+	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 medias
 	is probably bad, your diskless setup isn't correct or you may have
 	a hardware or configuration problem.
 
-	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 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
 	may be warned that the kernel can't figure out what device
 	it booted from and that no swap space is present.  Do not be
-	alarmed, these are completely normal.  The first warning
-	occurs because while OpenBSD/sun3 can boot from the floppy
-	drive, the kernel itself lacks a floppy driver for some
-        architectures.
-
-	When the loading process is complete, the boot floppy will be
-	ejected and you will be prompted to insert a filesystem floppy,
-	just hit return since the filesystem is contained in the kernel
-	image just loaded.  Next there will be a prompt asking you for
-	a shell name, just hit return to start executing the installation
-	setup script.
+	alarmed, these are completely normal.
 
 	You will next be asked for your terminal type.  If you are
 	installing from a keyboard/monitor console, the default of
 	"sun" if correct.  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).  Next you
-	will be prompted for a choice of which text editor to use at
-	several places in the install script.  You will probably want
-	to use "vi" if your terminal supports this.
+	(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.
@@ -252,32 +221,16 @@ OpenBSDCommonFS
 		
 OpenBSDCommonURL
 
-After completing an installation:
-
-Now try a reboot.  (If needed, swap your scsi id's first).  Initially
-I'd suggest you "boot sd()bsd -bs", then try multiuser after that.
-if you boot single-user the OpenBSD incantation to make the root
-filesystem writable is
-
-    OpenBSD# mount -u /dev/sd0a /
-
 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 "console" 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.  
+"sun" and "console" to "vt100" and "std.9600" or something similar.
 
 In order to use 'tip' on OpenBSD/sun3, you'll need to edit /etc/ttys
 and add "local" to the end of the tty configuration line, and run 
 'ttyflags -a' to put your changes into effect.
 
-On installing X11 for OpenBSD/sun3, you may wish to add a line similar to
-'ldconfig /usr/X11R6/lib' to the end of your /etc/rc.local file.  This will
-add the X libraries to your dynamic linking search path at boot time.
-
 If you are unfamiliar with UN*X-like system administration, 
 it's recommended that you buy a book that discusses it.
 
@@ -288,10 +241,11 @@ Installing from SunOS.
 You need a SunOS machine to install OpenBSD.  You also need at
 least the following pieces:
 
-    the *.tgz files you want to install (as a minimum, base{:--:}OSrev.tgz)
+    the *.tgz files you want to install (as a minimum, base{:--:}OSrev.tgz and
+        etc{:--:}OSrev.tgz)
     gunzip (GNU gzip) SunOS binary
     gtar (GNU tar) SunOS binary
-    a "/boot" file from a SunOS machine
+    a "/boot" file from a SunOS sun3 machine (not sun3x!)
     a kernel, most likely "/bsd"
 
 All these pieces, except "/boot" and the GNU utilities are supplied in
@@ -302,22 +256,22 @@ OpenBSD/sun3 uses SunOS disk labels.)  Give yourself adequate
 partition sizes.  Here is an example layout:
 
     partition    size   offset	  will be..
-    sd0a        48825        0	  /
-    sd0b        69825    48825	  swap
-    sd0c       639450        0	  `whole disk'
-    sd0d        65625   118650    /var
-    sd0g       455175   184275	  /usr
-
-FYI, this particular disk setup is used on a model 3/60 connected
-to a shoebox with a Micropolis 1558 ESDI drive.
+    sd0a        80000        0	  /
+    sd0b       256000    80000	  swap
+    sd0c      4165271        0	  `whole disk'
+    sd0d       100000   436000    /var
+    sd0f       100000   336000    /tmp
+    sd0g      3229271   936000    /usr
+    sd0h       400000   536000    /var/tmp
 
 Use SunOS to newfs the partitions which will have filesystems on them.
 (OpenBSD's filesystem format is identical to SunOS).
 
     sunos# newfs /dev/rsd0a
     [... lots of output]
-    sunos# newfs /dev/rsd0g
-    [... lots of output]
+ 
+Repeat for any other partition (in this example, /dev/rsd0d, /dev/rsd0f,
+/dev/rsd0g, /dev/rsd0h).
 
 NOTE: If you are able to, there is a performance benefit from
 newfs'ing using OpenBSD.  If you newfs using the OpenBSD newfs command,
@@ -331,16 +285,19 @@ Mount those partitions in a tree formation, under /mnt; ie:
     sunos# df
     Filesystem            kbytes    used   avail capacity  Mounted on
     [...]
-    /dev/sd0a              11501       0   11501     0%    /mnt
-    /dev/sd0g             179529       0  179529     0%    /mnt/usr
+    /dev/sd0a              38427       0   38427     0%    /mnt
+    /dev/sd0d              48249       0   48249     0%    /mnt/var
+    /dev/sd0f              48249       0   48249     0%    /mnt/tmp
+    /dev/sd0g            1564024       0 1564024     0%    /mnt/usr
+    /dev/sd0h             193536       0  193536     0%    /mnt/var/tmp
 
 Place a standard SunOS "boot" program in /mnt (your new root
 partition), and use the SunOS command "installboot" to make it work.
 The installboot man page says to do something like this:
 
-    sunos# cp /usr/mdec/sdboot /mnt/boot
+    sunos# cp /usr/mdec/ufsboot /mnt/boot
     sunos# sync; sync
-    sunos# /usr/mdec/installboot -vlt /mnt/boot /usr/mdec/bootsd /dev/rsd0a
+    sunos# /usr/mdec/installboot -vlt /mnt/boot /usr/mdec/bootxx /dev/rsd0a
 
 You can now extract the provided "*.tgz files onto your disk.
 
@@ -356,10 +313,11 @@ And finally copy the OpenBSD kernel onto your disk.
     sunos# cp bsd /mnt/bsd
 
 The GNU gunzip and gtar programs are not distributed as part of SunOS,
-but may be present in your /usr/local/bin.  If not, you will need to obtain
-them from a GNU archive and install before proceeding.  The OpenBSD
-tar files are in the "new format" that includes directory information,
-and the standard SunOS tar will not extract from them successfully.
+but may be present in your /usr/local/bin.  If not, you will need to
+obtain them from a GNU archive and install before proceeding.  The
+OpenBSD tar files are in the "new format" that includes directory
+information, and the standard SunOS tar will not extract from them
+successfully.
 
 After the files have been extracted, setup /mnt/etc/fstab to match
 your actual disk layout.  (Minus the "/mnt" component of each path, of
@@ -451,4 +409,3 @@ A few configuration files need to be edited:
 Now you must populate the the `/dev' directory for your client. For
 this, you can simply change your working directory to `<root>/dev'
 and run the MAKEDEV script: `sh MAKEDEV all'.
-
diff --git a/distrib/notes/sun3/prep b/distrib/notes/sun3/prep
index 2b1b66e5edf..5d32d360413 100644
--- a/distrib/notes/sun3/prep
+++ b/distrib/notes/sun3/prep
@@ -1,11 +1,9 @@
-
 Sun3 machines usually need little or no preparation before installing
 OpenBSD, other than the usual, well advised precaution of BACKING UP
 ALL DATA on any attached storage devices.
 
 You will need to know the SCSI target ID of the drive on which you
-will install OpenBSD.  Note that SunOS/sun3 uses confusing names for
-the SCSI devices: target 1 is sd2, target 2 is sd4, etc.
+will install OpenBSD.
 
 It might be a good time to run the diagnostics on your Sun3.  First,
 attach a terminal to the "ttya" serial port, then set the "Diag/Norm"
@@ -13,9 +11,10 @@ switch to the Diagnostic position, and power-on the machine.  The
 Diag. switch setting forces console interaction to occur on ttya.
 
 The console location (ttya, ttyb, or keyboard/display) is controlled
-by address 0x1F in the EEPROM, which you can examine and change in
-the PROM monitor by entering "q1f" followed by a numeric value (or
-just a '.' if you don't want to change it).  Console values are:
+by address 0x1f in the EEPROM, which you can examine and change in
+the PROM monitor by entering "q 1f", then a numeric value (or just a
+'.' if you don't want to change it, and "q" again to return to the prom).
+Console values are:
 	00: default graphics display
 	10: tty a (9600-N-8-1)
 	11: tty b (1200-N-8-1)
@@ -23,9 +22,6 @@ just a '.' if you don't want to change it).  Console values are:
 
 OpenBSD will use the EEPROM setting to determine which device to
 use as the console, so you should make sure it is correct.
-Before you start you might need to consider your disk configuration
-to sort out a quirk in SCSI-ID to SD-UNIT mapping that exists on
-Sun Sparcstations.
 
 Please note that while OpenBSD and SunOS have a reasonable degree of
 compatibility between disk labels and filesystems there are some problems
@@ -44,24 +40,20 @@ both OpenBSD and SunOS environments on the same system.
     about missing . and .. entries.  Do *not* try to "correct" these
     problems, as attempting to do so will completely trash the filesystem.
 
-    You should avoid using the new OpenBSD "-s enable" option to the 
-    "tunefs" command, which enable the soft update feature.  
+    You should avoid using softupdates (option softdep in /etc/fstab)
+    on your shared filesystems.
     Although untested, it is likely that SunOS would be confused by a 
     filesystem with soft update flags enabled.
 
 The OpenBSD "Sun Compatible" disklabel have been extended to support 16
-partitions, which may be compatible with Solaris, but the old SunOS
-format(8) utility only sees the first 8 partititions and may "lose"
-information about the extended partitions.
+partitions, however the old SunOS format(8) utility only sees the first
+8 partitions and may "lose" information about the extended partitions.
 
 Use SunOS format(8) only with *extreme* caution on drives that contain
 OpenBSD partitions.
 
-
 OpenBSD and Sun BSD bootblocks are similar in concept, though implemented
 differently.  The OpenBSD bootblocks are architecture independent and also
 understand the extended disklabels with 16 partitions.  You can use SunOS
 bootblocks, but remember that OpenBSD bootblocks must be installed with
 OpenBSD installboot and SunOS bootblocks with SunOS installboot.
-
-
diff --git a/distrib/notes/sun3/upgrade b/distrib/notes/sun3/upgrade
index 64a8f222f25..81ae6caa65e 100644
--- a/distrib/notes/sun3/upgrade
+++ b/distrib/notes/sun3/upgrade
@@ -1,10 +1 @@
-To upgrade to OpenBSD OSREV from a previous version start with the general
-instructions in the section "Installing OpenBSD".
-
-After booting with the miniroot, select the (U)pdate option rather than
-the (I)nstall option at the prompt in the install process.
-
-The upgrade script will use the existing disk partitions to install the
-new system in, and also preserves files in `/etc' which you are likely
-to have customized since a previous installation.
-
+OpenBSDUpgrade
diff --git a/distrib/notes/sun3/whatis b/distrib/notes/sun3/whatis
index d2880197e56..1e438c90cad 100644
--- a/distrib/notes/sun3/whatis
+++ b/distrib/notes/sun3/whatis
@@ -1,20 +1,2 @@
-
-OpenBSD OSREV is the second 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 the following features:
-
-* Native boot programs for disk, network, and tape
-* Automated installation tools (using a "miniroot")
-* SCSI driver supporting DMA, interrupts, and
-  disconnect/reselect with SCSI-2 devices (optional)
-* Frame buffer drivers for bwtwo, cgtwo, cgfour,
-  all compatible with SunOS and the X Window System
-* Support for the Virtually Addressed Cache (VAC) on
-  Sun3/260 models (and vastly improved performance)
-* SMD disk drivers
-* SunOS 4.1 compatibility (runs most Sun3 applications)
-* Supports most SCSI devices (CD-ROM, etc)
-* Diskless boot capability
-
+OpenBSD/sun3 OSREV is a port to the ``sun3'' series of workstations
+manufactured by Sun in the late 1980s.
diff --git a/distrib/notes/sun3/xfer b/distrib/notes/sun3/xfer
index aaf79f0ebd7..c9fba3bb2a1 100644
--- a/distrib/notes/sun3/xfer
+++ b/distrib/notes/sun3/xfer
@@ -144,7 +144,7 @@ NFS, you must do the following:
 	(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,
+	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
@@ -173,4 +173,3 @@ following:
 
 	Once you have done this, you can proceed to the next step in
 	the upgrade process, actually upgrading your system.
-