Various updates. Grammar/spelling proofread by ericj.

5 files changed, 53 insertions, 37 deletions

diff --git a/distrib/notes/sun3/hardware b/distrib/notes/sun3/hardware
index 5a17915c1f8..db348b60287 100644
--- a/distrib/notes/sun3/hardware
+++ b/distrib/notes/sun3/hardware
@@ -28,9 +28,9 @@ The following Sun3 hardware is supported:
 		On-board "si" (SCSI-3)
 		VME "si" (SCSI-3) board
 
-	SMD Disks:  (the big, heavy ones 8^)
-		Xylogics 450/451  [Note 1]
-		Xylogics 753/7053 [Note 1]
+	SMD Disks:  (the big, heavy ones)
+		Xylogics 450/451
+		Xylogics 753/7053
 
 	Input devices:
 		Sun keyboard and mouse
@@ -38,10 +38,4 @@ The following Sun3 hardware is supported:
 	Miscellaneous:
 		Battery-backed real-time clock.
 
-Note 1:
-    SMD disk support is almost ready, but could not be tested
-    in time for this release.  Drivers are provided for the
-    Xylogics 450/451 and Xylogics 753/7053 VME boards only as
-    source code.  They compile but have never touched a disk.
-
 If it's not on this list, there is no support for it in this release.
diff --git a/distrib/notes/sun3/install b/distrib/notes/sun3/install
index 6f574d6937d..e291d3328e7 100644
--- a/distrib/notes/sun3/install
+++ b/distrib/notes/sun3/install
@@ -12,8 +12,8 @@ This is difficult to get set up correctly the first time, but easy to
 use afterwards.  (see ``Installing using a diskless setup'' below).
 
 It is also possible to install OpenBSD "manually" from a running SunOS
-system, using SunOS tools and gnu tar and gunzip (see ``Installing from SunOS''
-below).
+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:
@@ -29,7 +29,7 @@ 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 two"
+notes which might be useful, but outside the bounds of simple "how to"
 instructions.
 
 
@@ -223,8 +223,7 @@ may be a better option.
 	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.  Note that installation sets on multiple floppies is not
-	currently supported.
+	images.
 
 OpenBSDFTPInstall
 
@@ -234,7 +233,7 @@ OpenBSDTAPEInstall
 
 OpenBSDNFSInstall
 
-OpenBSDDISKInstall({:-"wdN" or -:},{:-only -:})
+OpenBSDDISKInstall({:-"xdN" or -:},{:-only -:})
 
 OpenBSDCommonFS
 		
@@ -290,12 +289,14 @@ OpenBSD/sun3 uses SunOS disk labels.)  Give yourself adequate
 partition sizes.  Here is an example layout:
 
     partition    size   offset	  will be..
-    sd0a        28140        0	  /
-    sd0b        16170    28140	  swap
-    sd0c       204540        0	  `whole disk'
-    sd0g       160230    44310	  /usr
+    sd0a        48825        0	  /
+    sd0b        69825    48825	  swap
+    sd0c       639450        0	  `whole disk'
+    sd0d        65625   118650    /var
+    sd0g       455175   184275	  /usr
 
-BTW, These are not recommended sizes.
+FYI, this particular disk setup is used on a model 3/60 connected
+to a shoebox with a Micropolis 1558 ESDI drive.
 
 Use SunOS to newfs the partitions which will have filesystems on them.
 (OpenBSD's filesystem format is identical to SunOS).
@@ -356,7 +357,7 @@ Now proceed to reboot the machine and the customize your installation.
 
 Net Boot or Diskless Setup Information:
 
-The set up is similar to SunOS diskless setup, but not identical, because
+The setup is similar to SunOS diskless setup, but not identical, because
 the Sun setup assumes that the bootblocks load a kernel image, which then
 uses NFS to access the exported root partition, while the OpenBSD bootblocks
 use internal NFS routines to load the kernel image directly from the
@@ -378,7 +379,7 @@ Normally, this file is a symbolic link to an appropriate second-stage
 boot program, which should be located in a place where the TFTP daemon
 can find it (remember, many TFTP daemons run in a chroot'ed environment).
 
-You can find the boot program in `/usr/mdec/boot' in the OpenBSD/sun3
+You can find the boot program in `/usr/mdec/netboot' in the OpenBSD/sun3
 distribution.
 
 Here's an example to illustrate this whole mess:
diff --git a/distrib/notes/sun3/prep b/distrib/notes/sun3/prep
index d03b1885ca2..2b1b66e5edf 100644
--- a/distrib/notes/sun3/prep
+++ b/distrib/notes/sun3/prep
@@ -19,7 +19,7 @@ just a '.' if you don't want to change it).  Console values are:
 	00: default graphics display
 	10: tty a (9600-N-8-1)
 	11: tty b (1200-N-8-1)
-	20: Color option board on P4
+	20: Color option board on P4 (model 3/60 only)
 
 OpenBSD will use the EEPROM setting to determine which device to
 use as the console, so you should make sure it is correct.
@@ -49,15 +49,6 @@ both OpenBSD and SunOS environments on the same system.
     Although untested, it is likely that SunOS would be confused by a 
     filesystem with soft update flags enabled.
 
-OpenBSD supports both OpenBSD "native" disklabels and "Sun compatible"
-disklabels.  Unless you have some really good reason, you should stick
-with the Sun compatible labels.  The disklabel(8) "-r" switch says to
-use OpenBSD labels, which is a bit counter-intuitive and contrary to
-the reasons why might want to use "-r" on other OpenBSD ports.
-
-Don't use "-r" with disklabel(8).
-
-
 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"
diff --git a/distrib/notes/sun3/whatis b/distrib/notes/sun3/whatis
index 56f9bdd8219..d2880197e56 100644
--- a/distrib/notes/sun3/whatis
+++ b/distrib/notes/sun3/whatis
@@ -1,5 +1,5 @@
 
-OpenBSD OSREV is the first "full" release of OpenBSD for the sun3,
+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.
 
@@ -13,7 +13,7 @@ This release offers the following features:
   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 -- almost (still need testing)
+* SMD disk drivers
 * SunOS 4.1 compatibility (runs most Sun3 applications)
 * Supports most SCSI devices (CD-ROM, etc)
 * Diskless boot capability
diff --git a/distrib/notes/sun3/xfer b/distrib/notes/sun3/xfer
index 296b2051b39..aaf79f0ebd7 100644
--- a/distrib/notes/sun3/xfer
+++ b/distrib/notes/sun3/xfer
@@ -3,10 +3,11 @@ Installation is supported from several media types, including:
 	FFS partitions
 	Tape
 	Remote NFS partition
+	CD-ROM (with PROM versions >= 3.0)
 	FTP
 	HTTP
 
-However, you can only boot the installation procedure from tape or
+However, you can only boot the installation procedure from disk, tape or
 network. This requires some setup work to prepare a bootable image,
 either a tape, or a compatible net boot server.
 
@@ -20,6 +21,35 @@ widely in terms of what peripherals and what sort of network arrangements
 a user has, the intent is to provide some way that will be practical.
 
 
+Creating a bootable hard disk using SunOS or other Un*x-like system:
+
+	You can copy the miniroot image "miniroot{:--:}OSrev.fs" onto
+	the hard disk you intend to boot on.  Traditionally, the
+	way to do this is to use dd(1) to place the bootable filesystem
+	image in the "swap" partition of the disk (while running in
+	single user mode), and then booting from that partition.
+
+	Using the "b" partition allows you to boot without overwriting
+	any useful parts of the disk, you can also use another partition,
+	but don't used the "a" or "c" partition without understanding
+	the disklabel issues described below under "incompatible systems".
+
+	This requires that you be running SunOS, Solaris, OpenBSD or NetBSD
+	which have a compatible view of SunOS disk labels and partitions.
+
+	Use the dd(1) utility to copy the file to the hard drive.
+	Under SunOS, the command would be:
+
+		dd if=floppy{:--:}OSrev.fs of=/dev/rsd0b bs=36b
+				- or -
+		dd if=miniroot{:--:}OSrev.fs of=/dev/rsd0b bs=36b
+
+	The blocksize is arbitrary as long as it's a multiple of 512-bytes
+	and within the maximum supported by the driver, i.e. bs=126b may
+	not work for all cases.  Again, device/partition names may vary,
+	depending on the OS involved.
+
+
 Creating a network bootable setup using SunOS or other Un*x-like system:
 
 	The details of setting up a network bootable environment vary
@@ -93,8 +123,8 @@ To install or upgrade OpenBSD using a tape, you need to do the following:
 	sh -x /tmp/maketape noboot
 
 	
-If you're using a system other than OpenBSD or SunOS, the tape name and
-other requirements may change.
+	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