The final round of sparc64 installation notes updates:

- add miniroot and bootable cd-rom information
- fix a few wordings
- fix incorrect Solaris manual pages section names
- replace a rip-off of boot_sparc(8) with a more adequate rip-off of
  boot_sparc64(8)

The whole ok deraadt@

5 files changed, 67 insertions, 91 deletions

diff --git a/distrib/notes/sparc64/contents b/distrib/notes/sparc64/contents
index 54eddd6d41a..e8c73d52638 100644
--- a/distrib/notes/sparc64/contents
+++ b/distrib/notes/sparc64/contents
@@ -1,12 +1,11 @@
 TopPart
 
-dnl XXX uncomment when miniroot available
-dnl OpenBSDminiroot
-dnl				It can be copied to the swap partition of
-dnl				an existing OpenBSD, NetBSD, Linux or Solaris
-dnl				installation to allow installing or upgrading
-dnl				to OpenBSD OSREV
-dnl
+OpenBSDminiroot
+				It can be copied to the swap partition of
+				an existing OpenBSD, NetBSD, Linux or Solaris
+				installation to allow installing or upgrading
+				to OpenBSD OSREV.
+
 OpenBSDfloppy
 				This floppy image will boot on SBus-based
 				MACHINE models, such as:
diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install
index f485b42fa66..053e8e34f05 100644
--- a/distrib/notes/sparc64/install
+++ b/distrib/notes/sparc64/install
@@ -1,14 +1,8 @@
 OpenBSDInstallPrelude
 
-dnl XXX uncomment and alter once there is cdrom or miniroot
-dnl XXX available.
-dnl There are several ways to install OpenBSD onto a disk. The easiest way
-dnl in terms of preliminary setup is to use the OpenBSD miniroot that can
-dnl be booted off your local disk's swap partition.   The normal way is to
-dnl use the OpenBSD installation floppy.
 There are several ways to install OpenBSD onto a disk. The easiest way
 in terms of preliminary setup is to use the OpenBSD installation
-floppy.
+cdrom, or an installation floppy.
 
 If your machine is hooked up in a network and you can find a server to
 arrange for a diskless setup, which is a convenient way to install on a
@@ -44,32 +38,24 @@ Booting from Floppy Disk installation media:
 This will cause the kernel contained in the floppy to be booted.
 
 
-dnl XXX no cdrom release yet
-dnl Booting From CD-ROM installation media:
-dnl 
-dnl	ok boot cdrom OSREV/MACHINE/bsd.rd
-dnl
-dnl If the boot is successful, you will get a loader version message,
-dnl executable sizes and then the Kernel copyright and device probe
-dnl messages.  Boot failure modes are typically a lot of CD-ROM drive
-dnl activity, but no messages or complaints about magic numbers,
-dnl checksums or formats.
-dnl
-dnl
-dnl XXX no miniroot filesystem yet
-dnl Booting from disk (miniroot or floppy image):
-dnl When miniroot available replace occurences of ``floppy image''
-dnl with ``miniroot'' since these instructions are primarily intended
-dnl for miniroot installation.
-Booting from disk (using the floppy image):
-
-dnl Boot the miniroot by typing the appropriate command at the PROM:
-Boot the floppy image by typing the appropriate command at the PROM:
+Booting From CD-ROM installation media:
+
+	ok boot cdrom OSREV/MACHINE/bsd.rd
+
+If the boot is successful, you will get a loader version message,
+executable sizes and then the Kernel copyright and device probe
+messages.  Boot failure modes are typically a lot of CD-ROM drive
+activity, but no messages or complaints about magic numbers,
+checksums or formats.
+
+
+Booting from disk (miniroot or floppy image):
+
+Boot the miniroot by typing the appropriate command at the PROM:
 
 	ok boot disk:b bsd
 
-dnl If you've loaded the miniroot onto some other disk than the default
-If you've loaded the floppy image onto some other disk than the default
+If you've loaded the miniroot onto some other disk than the default
 drive 0, modify the boot specifier accordingly, keeping in mind the
 partition naming a=0, b=1... 
 
@@ -103,9 +89,7 @@ command at the monitor prompt:
 	ok boot net bsd.rd
 
 
-dnl XXX Update title when installation media becomes available.
-dnl Installing using the Floppy, CD-ROM, miniroot or netboot procedure:
-Installing using the Floppy or netboot procedure:
+Installing using the Floppy, CD-ROM, miniroot or netboot procedure:
 
 OpenBSDInstallPart2
 
@@ -218,6 +202,10 @@ OpenBSDHTTPInstall
 OpenBSDTAPEInstall
 
 OpenBSDCDROMInstall
+
+	On some pci-based systems, installing files from CD-ROM yields
+	a lot of ``pciide bogus intr'' warning messages.  While annoying,
+	these messages do not prevent the installation from suceeding.
 		
 OpenBSDNFSInstall
 
@@ -236,11 +224,14 @@ filesystem writable is
 
     OpenBSD# mount -u /dev/sd0a /
 
-The Sun monitor normally tries to load a file called "vmunix".   
-On OpenBOOT ROM systems you can change it to load OpenBSD instead using
-the following commands:
+The UltraSPARC OpenFirmware will normally load the kernel from the device
+and filename as instructed by the ``boot-device'' and ``boot-file''
+variables.  If the ``boot-file'' variable is empty, the OpenBSD bootloader
+will look for a kernel named ``bsd'', unless a different filename has been
+specified in the boot command.  To reset this variable to its default,
+empty, value, type the following:
 
-    ok setenv boot-file bsd
+    ok set-default boot-file
 
 
 OpenBSDCongratulations
diff --git a/distrib/notes/sparc64/prep b/distrib/notes/sparc64/prep
index 2d186475292..bca5afc0bd7 100644
--- a/distrib/notes/sparc64/prep
+++ b/distrib/notes/sparc64/prep
@@ -28,10 +28,10 @@ both OpenBSD and Solaris environments on the same system.
 
 The OpenBSD "Sun Compatible" disklabel have been extended to support 16
 partitions, which may be compatible with Solaris, but the Solaris
-format(8) utility only sees the first 8 partitions and may "lose"
+format(1M) utility only sees the first 8 partitions and may "lose"
 information about the extended partitions.
 
-Use Solaris format(8) only with *extreme* caution on drives that contain
+Use Solaris format(1M) only with *extreme* caution on drives that contain
 OpenBSD partitions.
 
 
@@ -42,9 +42,9 @@ bootblocks, but remember that OpenBSD bootblocks must be installed with
 OpenBSD installboot and Solaris bootblocks with Solaris installboot.
 
 Most of new Ultras shipped by Sun with a preinstalled Solaris have an
-initial strange setup of the boot ROM, in order to start up Solaris
-WebStart at the first boot: boot-device is set to disk:f.  Make sure
-you reset the boot device to its default value:
+initial specific factory setup of the boot ROM, in order to start up
+Solaris WebStart at the first boot; the boot-device variable is set to
+disk:f.  Make sure you reset the boot device to its default value:
 
     ok set-default boot-device
 
diff --git a/distrib/notes/sparc64/upgrade b/distrib/notes/sparc64/upgrade
index 085f269744d..69b1e7fe73b 100644
--- a/distrib/notes/sparc64/upgrade
+++ b/distrib/notes/sparc64/upgrade
@@ -3,6 +3,4 @@ are not expected.
 If you have been using an old OpenBSD/MACHINE snapshot, you can follow the
 following instructions.
 
-dnl XXX uncomment once miniroot available
-dnl OpenBSDUpgrade({:-the miniroot, or the installation floppy-:})
-OpenBSDUpgrade({:-the installation floppy-:})
+OpenBSDUpgrade({:-the miniroot, or the installation floppy-:})
diff --git a/distrib/notes/sparc64/xfer b/distrib/notes/sparc64/xfer
index 0a377916b45..78b99a75a53 100644
--- a/distrib/notes/sparc64/xfer
+++ b/distrib/notes/sparc64/xfer
@@ -7,45 +7,35 @@ Installation is supported from several media types, including:
 	FTP
 	HTTP
 
-dnl XXX uncomment when cd-rom distribution available
-dnl If you have the OpenBSD CD-ROM distribution (and a CD-ROM drive), you
-dnl may be able boot from it. If you can boot from the CD-ROM,
-dnl you are home free and can proceed to the installation steps.  If not,
-dnl you will need to do some setup work to prepare a bootable image, either
-dnl a floppy, hard drive, or compatible net boot server.
-dnl 
+If you have the OpenBSD CD-ROM distribution (and a CD-ROM drive), you
+may be able boot from it. If you can boot from the CD-ROM,
+you are home free and can proceed to the installation steps.  If not,
+you will need to do some setup work to prepare a bootable image, either
+a floppy, hard drive, or compatible net boot server.
+
 In addition to the bootable image, you also need to consider how to
 access the binary distribution sets to actually install the system.
-dnl XXX uncomment when cd-rom distribution available
-dnl If you have the OpenBSD CD-ROM distribution you can either access the
-dnl CD-ROM directly from the bootable image or remotely mounted on another
-dnl system via NFS.
-dnl
-dnl Although you can access the distribution sets directly from the CD-ROM or
-dnl from one of the FTP mirrors over the internet, you may wish to transfer
-dnl the sets to a local FTP or NFS server, or copy them to a partition on
-dnl the target system's disk.
+If you have the OpenBSD CD-ROM distribution you can either access the
+CD-ROM directly from the bootable image or remotely mounted on another
+system via NFS.
+
+Although you can access the distribution sets directly from the CD-ROM or
+from one of the FTP mirrors over the internet, you may wish to transfer
+the sets to a local FTP or NFS server, or copy them to a partition on
+the target system's disk.
 
 OpenBSDXferFloppyFromDOS
 
 OpenBSDXferFloppyFromUNIX
 
-dnl XXX make sure to adapt text, especially examples, once miniroot
-dnl is available as well.
 Creating a bootable hard disk using SunOS, Solaris or other Un*x-like system:
 
-dnl	If you don't have a floppy drive you can copy the floppy
-dnl 	installation image "floppy{:--:}OSrev.fs" or the mini-root "miniroot{:--:}OSrev.fs"
-dnl 	onto the hard disk you intend to boot on.  Traditionally, the
-dnl 	way to do this is to use dd(1) to place the bootable filesystem
-dnl 	image in the "swap" partition of the disk (while running in
-dnl 	single user mode), and then booting from that partition.
 	If you don't have a floppy drive you can copy the floppy
-	installation image "floppy{:--:}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.
+ 	installation image "floppy{:--:}OSrev.fs" or the mini-root "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,
@@ -58,12 +48,12 @@ dnl 	single user mode), and then booting from that partition.
 	Use the dd(1) utility to copy the file to the hard drive.
 	The command would likely be, under SunOS:
 		dd if=floppy{:--:}OSrev.fs of=/dev/rsd0b bs=36b
-dnl 				- or -
-dnl 		dd if=miniroot{:--:}OSrev.fs of=/dev/rsd0b bs=36b
+ 				- or -
+ 		dd if=miniroot{:--:}OSrev.fs of=/dev/rsd0b bs=36b
 	and under Solaris:
 		dd if=floppy{:--:}OSrev.fs of=/dev/c0t0d0s1 bs=36b
-dnl 				- or -
-dnl 		dd if=miniroot{:--:}OSrev.fs of=/dev/c0t0d0s1 bs=36b
+ 				- or -
+ 		dd if=miniroot{:--:}OSrev.fs of=/dev/c0t0d0s1 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
@@ -88,12 +78,10 @@ dnl 		dd if=miniroot{:--:}OSrev.fs of=/dev/c0t0d0s1 bs=36b
 
 	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 off a ram-disk image in the kernel.
-dnl XXX uncomment end of paragraph once miniroot available
-dnl	since it actually runs off a ram-disk image in the kernel.  In
-dnl	contrast the miniroot is a normal unix root filesystem and you
-dnl	must place in a partition that will not be overwritten until you've
-dnl	completed the installation process.
+	since it actually runs off 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.
 
 	To copy the floppy image to the hard disk, preserving SunOS,
 	Solaris, NetBSD or OpenBSD labels: