corrections; david.michael.scott@gecm.com

4 files changed, 25 insertions, 19 deletions

diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index 8521440d16e..ee6ac9cccc6 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -15,8 +15,6 @@ as follows:
 		MD5		usable for verification of the correctness
 				of downloaded files.
 
-		X11/		The X window system for OpenBSD/sparc 2.3
-                                  
 		*.tar.gz	sparc binary distribution sets;
 				see below.
 
@@ -139,3 +137,10 @@ and are as follows:
 		manual pages.
 		[ 994K gzipped, 3.7M uncompressed ]
 
+	xbase23 This set includes the base X distribution.  This includes
+		programs, headers, libraries, configuration files.
+
+	xfont23 This set includes all of the X fonts.
+
+	xserv23 This set includes all of the X servers.
+
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index a2c8cee2daf..889868656d0 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -272,7 +272,7 @@ may be a better option.
 	"sd0") with the letter identifying the partition (eg. "d")
 	appended (eg. "sd0d").  Then it will ask where this partition is
 	to be mounted, eg. /usr.  This process will be repeated until
-	you just hit return.
+	you type "done".
 
 	At this point you will be asked to confirm that the file system
 	information you have entered is correct, and given an opportunity
@@ -606,7 +606,7 @@ Installing from SunOS.
 You need a SunOS machine to install OpenBSD.  You also need at
 least the following pieces:
 
-    the *.tar.gz files you want to install (as a minimum, base.tar.gz)
+    the *.tar.gz files you want to install (as a minimum, base23.tar.gz)
     gunzip (GNU gzip) SunOS binary
     gtar (GNU tar) SunOS binary
     a "/boot" file from a SunOS machine that matches your machine type
@@ -665,7 +665,8 @@ You can now extract the provided "*.tar.gz files onto your disk.
     sunos# ls -FC
     base23.tar.gz      etc23.tar.gz       man23.tar.gz       secr23.tar.gz
     comp23.tar.gz      games23.tar.gz     misc23.tar.gz      text23.tar.gz
-    bsd                bsd.scsi3
+    xbase23.tar.gz     xfont23.tar.gz     xserv23.tar.gz     bsd
+    bsd.scsi3
     sunos# gunzip < base23.tar.gz | (cd /mnt; gtar xvpf -)
     [...] for each set
 
@@ -747,15 +748,15 @@ kernel which is then read into memory.
 
 You will want export the miniroot23.fs filesystem to the client.  You
 can dd this filesystem image to some spare partition, mount and export
-tat partition or use tar to copy the contents to a more convenient spot.
+that partition or use tar to copy the contents to a more convenient spot.
 
-Alternatively you an build bootable partition from the distribution sets
+Alternatively you can build a bootable partition from the distribution sets
 as follows:
 
-Unpack `base.tar.gz' and `etc.tar.gz' on the server in the root directory
+Unpack `base23.tar.gz' and `etc23.tar.gz' on the server in the root directory
 for your target machine. If you elect to use a separately NFS-mounted
 filesystem for `/usr' with your diskless setup, make sure the "./usr" base
-files in base.tar.gz end up in the correct location. One way to do this is
+files in base23.tar.gz end up in the correct location. One way to do this is
 to temporarily use a loopback mount on the server, re-routing <root>/usr to
 your server's exported OpenBSD "/usr" directory. Also put the kernel and
 the install/upgrade scripts into the root directory.
diff --git a/distrib/notes/sparc/prep b/distrib/notes/sparc/prep
index f9d2ba17b56..da2fad3213a 100644
--- a/distrib/notes/sparc/prep
+++ b/distrib/notes/sparc/prep
@@ -31,7 +31,7 @@ to eliminate SunOS altogether it may be best to correct the scsi-id's
 of your drives, while if you plan to leave SunOS installed, it may
 be better to install OpenBSD on a drive with scsi-id 1 or 0.
 
-Some OpenBoot proms provide and environment variable that controls
+Some OpenBoot proms provide an environment variable that controls
 the drive<->scsi-id mapping, you can change this to reflect the natural
 ordering or just set the boot related variables to boot from the
 correct drive, whatever the numbering.
diff --git a/distrib/notes/sparc/xfer b/distrib/notes/sparc/xfer
index e6f4150432a..8519c961d0b 100644
--- a/distrib/notes/sparc/xfer
+++ b/distrib/notes/sparc/xfer
@@ -86,7 +86,7 @@ Creating a bootable floppy disk using SunOS or other Un*x-like system:
 	multiples of 512-byte blocks.  The variations are endless and
 	beyond the scope of this document.
 
-	If you're doing this on the system you intend to be the floppy on,
+	If you're doing this on the system you intend to boot the floppy on,
 	copying the floppy back to a file and doing a compare or checksum
 	is a good way to verify that the floppy is readable and free of
 	read/write errors.
@@ -96,7 +96,7 @@ Creating a bootable floppy disk using SunOS or other Un*x-like system:
 Creating a bootable hard disk using SunOS or other Un*x-like system:
 
 	If you don't have a floppy drive you can copy the single floppy
-	installation image "floppy.fs" or the mini-root "miniroot.fs"
+	installation image "floppy23.fs" or the mini-root "miniroot23.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
@@ -105,12 +105,12 @@ Creating a bootable hard disk using SunOS or other Un*x-like system:
 	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 "uncompatible systems".
+	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 floppy drive.
+	Use the dd(1) utility to copy the file to the hard drive.
 	Under SunOS, the command would be:
 
 		dd if=floppy23.fs of=/dev/rsd0b bs=36b
@@ -133,7 +133,7 @@ Creating a bootable hard disk using SunOS or other Un*x-like system:
 
 	The floppy image is used only for booting, and can be placed in
 	a partition that will be overwritten during the install process,
-	since it actually runs of of a ram-disk image in the kernel.  In
+	since it actually runs off of a ram-disk image in the kernel.  In
 	contrast the miniroot is a normal unix root filesystem and you
 	must place in a partition that will not be overwritten until you've
 	completed the installation process.
@@ -177,7 +177,7 @@ Creating a network bootable setup using SunOS or other Un*x-like system:
 
 	The details of setting up a network bootable environment vary
 	considerably, depending on the networks host.  Extract the
-	OpenBSD diskless(8) man page from the share.tar.gz distribution
+	OpenBSD diskless(8) man page from the man23.tar.gz distribution
 	set or see the copy on the OpenBSD web page.  You will also
 	need to reference the relevant man pages or administrators guide
 	for the host system.
@@ -207,8 +207,8 @@ To install or upgrade OpenBSD using a tape, you need to do the following:
 	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 a tape
-	with the files.
+	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
@@ -217,7 +217,7 @@ To install or upgrade OpenBSD using a tape, you need to do the following:
 	#! /bin/sh
 	tape=/dev/nrst0
 	mt -f ${tape} rewind
-	for file in base23 etc23 comp23 game23 man23 misc23 text23
+	for file in base23 etc23 comp23 game23 man23 misc23 text23 x*23
 	do
 		dd if=${file}.tar.gz of=${tape}
 	done