Ugh, there's SOO much left to do here

4 files changed, 27 insertions, 51 deletions

diff --git a/distrib/notes/sparc64/contents b/distrib/notes/sparc64/contents
index d764e72cd13..2e148a08b81 100644
--- a/distrib/notes/sparc64/contents
+++ b/distrib/notes/sparc64/contents
@@ -8,9 +8,9 @@ OpenBSDrd
 
 		installboot	The OpenBSD/sparc64 boot loader installation
 				program
-		bootxx		The OpenBSD/sparc64 boot block
-		boot		The OpenBSD/sparc64 secondary boot loader
-		boot.net	The OpenBSD/sparc64 network boot loader
+		bootblk		The OpenBSD/sparc64 boot block
+		ofwboot		The OpenBSD/sparc64 secondary boot loader
+		ofwboot.net	The OpenBSD/sparc64 network boot loader
 
 
 Please note that there are multiple bootable images and kernels, intended
@@ -21,8 +21,8 @@ The "miniroot{:--:}OSrev.fs" is a small bootable root filesystem that can be use
 for installation or upgrade where there is some means to copy the miniroot
 image into a swap or unused partition on the system, and also for diskless
 or net booting.  This can be convenient if you have a existing installation
-of OpenBSD, NetBSD, SunOS, or Solaris and wish to test or upgrade the
-existing system to OpenBSD.
+of OpenBSD, NetBSD, or Solaris and wish to test or upgrade the existing
+system to OpenBSD.
 
 These bootable images are also useful as "failsafe" boots for system
 maintenance and disaster recovery.
@@ -34,25 +34,17 @@ Sun bootblocks require a separate kernel image and root filesystem.
 
 Bootable installation images:
   
-DistributionDescription(ten)
+DistributionDescription(six)
 
-OpenBSDbase(18.4M,56.4M)
+OpenBSDbase(58.0M,149.0M)
 
-OpenBSDcomp(12.1M,39.7M)
+OpenBSDcomp(13.9M,50.4M)
 
-OpenBSDetc(165.2K,740.0K)
+OpenBSDetc(1.0M,3.5M)
 
-OpenBSDgame(2.7M,6.7M)
+OpenBSDgame(6.7M,15.8M)
 
-OpenBSDman(3.4M,13.1M)
+OpenBSDman(5.3M,20.7M)
 
-OpenBSDmisc(1.6M,5.4M)
-
-OpenBSDxbase(4.6M,12.9M)
-
-OpenBSDxshare(1.4M,8.3M)
-
-OpenBSDxfont(6.0M,7.3M)
-
-OpenBSDxserv(5.4M,14.6M)
+OpenBSDmisc(1.6M,5.5M)
 
diff --git a/distrib/notes/sparc64/prep b/distrib/notes/sparc64/prep
index 1589c5233bc..960d707b80e 100644
--- a/distrib/notes/sparc64/prep
+++ b/distrib/notes/sparc64/prep
@@ -1,20 +1,4 @@
 
-Your OpenBOOT ROM may need some setup.  If you are running OpenBSD on
-a sun4c, or sun4m system, the ROM must be set to "new" command mode.
-If your sun4c or sun4m machine comes up and gives you a `>' prompt
-instead of `ok', type:
-
-    >n
-    ok setenv sunmon-compat? false
-    ok
-
-This is needed because OpenBSD relies on the behaviour of the "new" command
-mode.  OpenBSD will not boot correctly on sun4c or sun4m systems that 
-are not running in "new" command mode.  The sun4 systems such as the 4/110, 
-4/200, and 4/300 system do not have a "new" command mode, and will work
-fine as-is.
-
-
 Your OpenBOOT ROM may need some setup.  You cannot use the security modes
 of the sparc OpenBOOT ROM.  Make sure that the ROM security modes are
 disabled:
@@ -22,41 +6,41 @@ disabled:
     ok setenv security-mode none
 
 
-Please note that while OpenBSD and SunOS have a reasonable degree of
+Please note that while OpenBSD and Solaris have a reasonable degree of
 compatibility between disk labels and filesystems there are some problems
 to watch out for during initial installation or when trying to maintain
-both OpenBSD and SunOS environments on the same system.
+both OpenBSD and Solaris environments on the same system.
 
-    If the OpenBSD fsck(8) utility is used on a SunOS filesystem, it will
+    If the OpenBSD fsck(8) utility is used on a Solaris filesystem, it will
     set OpenBSD "clean flags" and BSD4.4 summary fields in the superblock.
     SunOS does *not* like this and you will have to do a "fsck -b 32" under
     SunOS to access an alternate superblock to repair the filesystem.  You
-    should always specify SunOS filesystem with a "pass number" of 0 in
+    should always specify Solaris filesystem with a "pass number" of 0 in
     their /etc/fstab entry to prevent this, and preferably mount them "RO".
 
-    If SunOS fsck is used on an OpenBSD filesystem in the default OpenBSD
+    If Solaris fsck is used on an OpenBSD filesystem in the default OpenBSD
     (4.4BSD) format, it will first complain about the superblock and then
     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 soft updates (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.
+    on your shared filesystems.  Although untested, it is likely that
+    Solaris 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
+partitions, which may be compatible with Solaris, but the old Solaris
 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
+Use Solaris format(8) only with *extreme* caution on drives that contain
 OpenBSD partitions.
 
 
-OpenBSD and Sun BSD bootblocks are similar in concept, though implemented
+OpenBSD and Sun 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
+understand the extended disklabels with 16 partitions.  You can use Solaris
 bootblocks, but remember that OpenBSD bootblocks must be installed with
-OpenBSD installboot and SunOS bootblocks with SunOS installboot.
+OpenBSD installboot and Solaris bootblocks with Solaris installboot.
 
 
diff --git a/distrib/notes/sparc64/whatis b/distrib/notes/sparc64/whatis
index 8956be0a8a4..a8bc9cd4615 100644
--- a/distrib/notes/sparc64/whatis
+++ b/distrib/notes/sparc64/whatis
@@ -1,5 +1,6 @@
-OpenBSD/sparc64 OSREV is a port to the UltraSPARC processor-based machine,
+OpenBSD/sparc64 OSREV is a port to the UltraSPARC processor-based machines,
 such as the workstations manufactured by Sun Microsystems.
 
 This port is in its infancy, so device support is somewhat limited, but
 active development is continuing.
+
diff --git a/distrib/notes/sparc64/xfer b/distrib/notes/sparc64/xfer
index 41a53611a28..f023c0c2ffb 100644
--- a/distrib/notes/sparc64/xfer
+++ b/distrib/notes/sparc64/xfer
@@ -1,7 +1,6 @@
 Installation is supported from several media types, including:
 
 	FFS partitions
-	Tape
 	Remote NFS partition
 	CD-ROM
 	FTP