- update hardware list, mention some unsupported devices as well.

- move open firmware 101 to the ``preparation'' section
- don't try to scare people wanting to upgrade, it works well nowadays
- remove the note about not being able to boot from a Zip disk.

thanks to some feedback from drahn@

5 files changed, 96 insertions, 98 deletions

diff --git a/distrib/notes/macppc/contents b/distrib/notes/macppc/contents
index 4404858b3a4..9f0e3c2d674 100644
--- a/distrib/notes/macppc/contents
+++ b/distrib/notes/macppc/contents
@@ -9,95 +9,6 @@ OpenBSDrd
 		cd{:--:}OSrev.fs The standard MACHINE boot and installation
 				CD image; see below.
 
-There are several ways to boot a supported PowerPC Macintosh system into
-the OpenBSD installer.  Unfortunately they all currently require some
-limited knowledge of Open Firmware, the low-level process that controls
-the microprocessor after hardware initialization and diagnostics are
-performed but before control is handed to the operating system.
-
-To access Open Firmware you should simultaneously hold down the
-Command, Option, O and F keys immediately upon booting.  You will
-be presented with information and a ">" prompt that will look something
-like this (example taken from a Power Macintosh G4):
-
-Apple PowerMac3,1 2.4f1 BootROM built on 02/18/00 at 09:44:35
-Copyright 1994-2000 Apple Computer, Inc.
-All Rights Reserved
-
-Welcome to Open Firmware
-To continue booting, type "mac-boot" and press return
-To shut down, type "shut-down" and press return
-
- ok
-0 >
-
-Important Open Firmware command examples:
------------------------------------------
-
-boot cd:,ofwboot /OSREV/MACHINE/bsd.rd
-
-		(boot from an appropriately prepared
-		OpenBSD CD in the CD/DVD drive)
-
-boot enet:,ofwboot /bsd.rd
-
-		(netboot from a pre-configured bootp/tftp/nfs
-		server containing the "ofwboot" and "bsd.rd"
-		files at the root directory of the tftp server)
-
-boot ide1:,ofwboot /bsd
-
-		(After installation, boot /bsd from the slave
-		 device on the second ATA bus)
-
-mac-boot	(boot into MacOS)
-reset-all	(reboot the machine)
-shut-down	(halt the machine; shutdown)
-printenv	(print current machine variables)
-setenv		(set a machine variable)
-devalias	(list device aliases; useful for locating other
-		devices in the machine such as hard drives etc)
-
-As seen above, device aliases typically take the form of "ide", "cd"
-etc.  To boot to an alternative device you may substitute them
-with entries from this list (example devices taken from a Power
-Macintosh G4):
-
-ultra0 = hd = master device, primary ATA bus (factory-installed drive)
-ultra1 =      slave device, primary ATA bus
-ide0   = cd = master device, secondary ATA bus (CD/DVD drive)
-ide1   =      slave device, secondary ATA bus (Zip drive, if installed)
-enet   =      motherboard ethernet device
-
-Other Open Firmware command examples:
--------------------------------------
-
-setenv auto-boot? false
-
-		(force the machine to wait at Open Firmware
-		for user input at next reboot; options are true/false)
-
-setenv boot-device ide:,ofwboot /bsd
-
-		(force the machine to boot into OpenBSD
-		automatically at next reboot)
-
-dev /		(change to root level of the device tree)
-pwd		(show current location in the device tree)
-ls		(show items at current location in the device tree)
-words		(show methods of items at current location in the device tree)
-.properties	(show properties of items at current location in the device tree)
-
-
-NOTES:
-	The MACHINE port does not currently support booting from a USB
-	Zip drive, if installed.
-
-	To reset a Power Macintosh to the factory-configure Open Firmware
-	settings, simultaneously hold down the Command, Option, P, R keys
-	immediately upon booting.  Typically the machine will then attempt to
-	load Mac OS, if available.
-
 DistributionDescription(ten)
 
 OpenBSDbase(23.4M,70.8M,shared)
diff --git a/distrib/notes/macppc/hardware b/distrib/notes/macppc/hardware
index f175d52ac4b..ea2e25f73a9 100644
--- a/distrib/notes/macppc/hardware
+++ b/distrib/notes/macppc/hardware
@@ -21,7 +21,7 @@ Supported devices {:-include-:}:
 	AGP/SVGA/VGA Display Adapters: Primary Openfirmware display only.
 
 	Serial ports:
-		None.
+		Built-in Zilog 8530-based serial ports.
 
 	Ethernet adapters:
 		Digital DC21x4x-based PCI Ethernet adapters, including:
@@ -44,12 +44,18 @@ Supported devices {:-include-:}:
 		Atapi DVD-RAM drives (read-only)
 		Atapi CD-RW drives.
 
+	Keyboard:
+		ADB and USB keyboards.
+
 	Mice:
 		USB Mice.
 
 	Sound Cards:
-		AWACS supported, but not enabled due to performance issue.
+		AWACS.
 
 	Miscellaneous:
 		USB Hubs.
 		USB printers.
+
+The built-in modem and firewire (IEEE1394) ports in some machines are not
+currently supported.
diff --git a/distrib/notes/macppc/install b/distrib/notes/macppc/install
index bca9f8cb8e2..c7f3e6f74a4 100644
--- a/distrib/notes/macppc/install
+++ b/distrib/notes/macppc/install
@@ -20,8 +20,9 @@ OpenBSDInstallPart2
 
 	At this time, the system can be installed from the supplied
 	CD boot image, by network loading the bootloader or loading
-	the bootloader and kernel from a HFS partition.  Once
-	the bootloader is installed on the local hard drive, the
+	the bootloader and kernel from a HFS partition.
+
+	Once the bootloader is installed on the local hard drive, the
 	system can boot from it. OpenBSD may share a drive with MacOS
 	if the process is followed carefully. Currently it is
 	necessary to use OpenFirmware commands to dual boot between
@@ -29,8 +30,8 @@ OpenBSDInstallPart2
 	Note that on many of the systems is it not possible to
 	automatically boot OpenBSD at this time.
 
-	(Refer to "OpenBSD OSREV Release Contents" above for information
-	on how to access and boot from Open Firmware)
+	(Refer to "Preparing your System for OpenBSD Installation" above
+	 for information on how to access and boot from Open Firmware)
 
 OpenBSDBootMsgs
 
diff --git a/distrib/notes/macppc/prep b/distrib/notes/macppc/prep
index d8af35f0c99..8c03e0a46ad 100644
--- a/distrib/notes/macppc/prep
+++ b/distrib/notes/macppc/prep
@@ -1,3 +1,86 @@
+To be able to boot the OpenBSD/MACHINE installation program, you will
+need to acquire some limited knowledge of OpenFirmware, the low-level
+process that controls the microprocessor after hardware initialization
+and diagnostics are performed but before control is handed to the
+operating system.
+
+To access Open Firmware you should simultaneously hold down the
+Command, Option, O and F keys immediately upon booting.  You will
+be presented with information and a ">" prompt that will look something
+like this (example taken from a Power Macintosh G4):
+
+Apple PowerMac3,1 2.4f1 BootROM built on 02/18/00 at 09:44:35
+Copyright 1994-2000 Apple Computer, Inc.
+All Rights Reserved
+
+Welcome to Open Firmware
+To continue booting, type "mac-boot" and press return
+To shut down, type "shut-down" and press return
+
+ ok
+0 >
+
+
+Important Open Firmware command examples:
+
+boot cd:,ofwboot /OSREV/MACHINE/bsd.rd
+		(boot from an appropriately prepared
+		OpenBSD CD in the CD/DVD drive)
+
+boot enet:,ofwboot /bsd.rd
+		(netboot from a pre-configured bootp/tftp/nfs
+		server containing the "ofwboot" and "bsd.rd"
+		files at the root directory of the tftp server)
+
+boot ide1:,ofwboot /bsd
+		(After installation, boot /bsd from the slave
+		 device on the second ATA bus)
+
+mac-boot	(boot into MacOS)
+reset-all	(reboot the machine)
+shut-down	(halt the machine; shutdown)
+printenv	(print current machine variables)
+setenv		(set a machine variable)
+devalias	(list device aliases; useful for locating other
+		devices in the machine such as hard drives etc)
+
+As seen above, device aliases typically take the form of "ide", "cd"
+etc.  To boot to an alternative device you may substitute them
+with entries from this list (example devices taken from a Power
+Macintosh G4):
+
+ultra0 = hd = master device, primary ATA bus (factory-installed drive)
+ultra1 =      slave device, primary ATA bus
+ide0   = cd = master device, secondary ATA bus (CD/DVD drive)
+ide1   =      slave device, secondary ATA bus (Zip drive, if installed)
+enet   =      motherboard ethernet device
+
+
+Other Open Firmware command examples:
+
+setenv auto-boot? false
+		(force the machine to wait at Open Firmware
+		for user input at next reboot; options are true/false)
+
+setenv boot-device ide:,ofwboot /bsd
+		(force the machine to boot into OpenBSD
+		automatically at next reboot)
+
+dev /		(change to root level of the device tree)
+pwd		(show current location in the device tree)
+ls		(show items at current location in the device tree)
+words		(show methods of items at current location in the device tree)
+.properties	(show properties of items at current location in the device tree)
+
+
+To reset a Power Macintosh to the factory-configure Open Firmware settings,
+simultaneously hold down the Command, Option, P, R keys immediately upon
+booting.  Typically the machine will then attempt to load Mac OS, if
+available.
+
+
+Sharing a disk with MacOS:
+
 OpenBSD/MACHINE is now capable of booting either from a dedicated
 disk using a MBR partitioned disk or sharing a disk with MacOS.
 
diff --git a/distrib/notes/macppc/upgrade b/distrib/notes/macppc/upgrade
index 68e28d0362c..81ae6caa65e 100644
--- a/distrib/notes/macppc/upgrade
+++ b/distrib/notes/macppc/upgrade
@@ -1,4 +1 @@
-Be warned that upgrades may not be well supported currently for the
-MACHINE port.
-
 OpenBSDUpgrade