Some mostly minor corrections to the powerpc install notes.

7 files changed, 34 insertions, 43 deletions

diff --git a/distrib/notes/powerpc/contents b/distrib/notes/powerpc/contents
index dc8428b1011..5058b9988b2 100644
--- a/distrib/notes/powerpc/contents
+++ b/distrib/notes/powerpc/contents
@@ -35,7 +35,7 @@ To netboot from a pre-configured bootp/tftp/nfs server containing the
 To boot from a HFS formatted CD containing the "ofwboot", "bsd.rd" and all
 other installation files at the root directory of the CD:
 
-	boot cd:,ofwboot /OSREV/powerpc/bsd.rd
+	boot cd:,ofwboot /OSREV/MACHINE/bsd.rd
 
 Post-install, you will need to boot into OpenBSD from a hard drive, and
 may need to reboot to Mac OS if you have it installed on another drive
@@ -49,7 +49,7 @@ Macintosh G4 (Tower):
 
 To reboot to Mac OS:
 
-	boot boot hd:,\\:tbxi
+	mac-boot
 
 Typically, substituting the device alias (devalias) will allow for easy to
 understand device selection.  Typical examples from a Power Macintosh G4
@@ -68,23 +68,23 @@ one disk.
 
 DistributionDescription
 
-OpenBSDbase(40.4M,101.3M)
+OpenBSDbase(23.8M,71.4M)
 
-OpenBSDcomp(14.3M,48.3M)
+OpenBSDcomp(19.1M,65.5M)
 
-OpenBSDetc(164.4K,740.0K)
+OpenBSDetc(1.0M,3.3M)
 
-OpenBSDgame(6.1M,14.2M)
+OpenBSDgame(2.7M,6.3M)
 
-OpenBSDman(3.4M,13.1M)
+OpenBSDman(5.2M,19.5M)
 
-OpenBSDmisc(1.6M,5.4M)
+OpenBSDmisc(5.6M,5.6M)
 
-OpenBSDxbase(35.2M,85.6M)
+OpenBSDxbase(4.4M,12.1M)
 
-OpenBSDxshare(1.4M,8.3M)
+OpenBSDxshare(1.5M,8.1M)
 
-OpenBSDxfont(1.4M,8.3M)
+OpenBSDxfont(6.2M,7.3M)
 
-OpenBSDxserv(2.7M,7.4M)
+OpenBSDxserv(2.1M,5.4M)
 
diff --git a/distrib/notes/powerpc/hardware b/distrib/notes/powerpc/hardware
index e21f41163fd..825713f3fba 100644
--- a/distrib/notes/powerpc/hardware
+++ b/distrib/notes/powerpc/hardware
@@ -1,11 +1,11 @@
-OpenBSD/MACHINE OSREV runs on iMac and possibly some other G3 and G4 Power
-Macintosh systems.  Older ADB-based systems are unlikely to work.  This is
-partially due to firmware issues and partially drive issues.
+OpenBSD/MACHINE OSREV runs on iMac, G4 Power Macintosh, G4 Cube as well
+as possibly some other G3 Macintosh systems.  Older ADB-based systems
+will not work, only USB keyboard is supported.
 
-Has been tested on iMac Rev A/233MHz and Rev C/333MHz machines as well as
-several Power Macintosh G4 systems (single and dual processor).  Some
-success has been reported on a PowerBook, however this is not well
-supported.
+Has been tested on iMac Rev A/233MHz and Rev C/333MHz machines, several
+Power Macintosh G4 systems (single and dual processor), as well as the
+G4 Cube.  Some success has been reported on a PowerBook, however this
+is not well supported.
 
 Some code has been written to work better on the B&W G3, but has never
 been retested.  Hardware availability is currently limiting development on
@@ -13,20 +13,20 @@ these systems.
 
 Supported devices {:-include-:}:
 
-	IDE hard disk controllers. iMac supported, other mac onboard possibly.
+	IDE hard disk controllers. iMac/G4 onboard supported.
 	SCSI host adapters:
 		Symbios Logic (NCR) 53C8xx-based PCI SCSI host adapters
 
-	VGA, SVGA Display Adapters. 
+	AGP/SVGA/VGA Display Adapters: Primary Openfirmware display only.
 
 	Serial ports:
 		None.
 
 	Ethernet adapters:
-		[OPENFIRMWARE SUPPORT]
 		Digital DC21x4x-based PCI Ethernet adapters, including:
-		Znyx ZX34X
+			Znyx ZX34X
 		Onboard iMac 10-100Mbs Ethernet, 100Mbs untested.
+		Onboard G4 (gm) ethernet.
 
 	Tape drives:
 		SCSI Tape drives
@@ -36,9 +36,11 @@ Supported devices {:-include-:}:
 		Atapi CD-ROM drives
 
 	Mice:
-		NONE
+		USB Mice.
 
 	Sound Cards:
 		NONE
 
 	Miscellaneous:
+		USB Hubs.
+		USB printers.
diff --git a/distrib/notes/powerpc/install b/distrib/notes/powerpc/install
index fe630943937..2eede947dc7 100644
--- a/distrib/notes/powerpc/install
+++ b/distrib/notes/powerpc/install
@@ -14,16 +14,6 @@ at boot time.  If possible, you should use the parameters it prints.
 another operating system, or because your disk is old enough that the
 kernel can't figure out its geometry.)
 
-If OpenBSD will be sharing the disk with DOS or another operating
-system, you should have already completed the section of these notes
-that instructed you on how to prepare your hard disk.  You should know
-the size of the OpenBSD area of the disk and its offset from the
-beginning of the disk.  You will need this information when setting up
-your OpenBSD partitions.  If your BIOS uses translated geometry, you
-should use this geometry for the remainder of the install.  This is
-only necessary if you are sharing the disk with other operating systems
-that use the translated geometry.
-
 You should now be ready to install OpenBSD.
 
 The following is a walk-through of the steps you will take while
@@ -94,11 +84,10 @@ process again from scratch.
 	DOS or Linux partitions defined on the disk, these will usually
 	show up as partition 'h', 'i' and so on.  It is recommended that
 	you create separate partitions for /usr and /var, and if you have
-	room for it, also for /home.
-	Currently OpenBSD will not share a disk with any other operating
-	system care should be taken not to overwrite any data on other
-	disks in the system and that no data is on the disk to be used 
-	for OpenBSD/MACHINE
+	room for it, also for /home.  Currently OpenBSD will not share a
+	disk with any other operating system care should be taken not to
+	overwrite any data on other disks in the system and that no data
+	is on the disk to be used for OpenBSD/MACHINE.
 
 	Note that all OpenBSD partitions in the disk label must have an
 	offset that makes it start within the OpenBSD part of the disk,
diff --git a/distrib/notes/powerpc/prep b/distrib/notes/powerpc/prep
index f0c2a213212..4c9e7f6a601 100644
--- a/distrib/notes/powerpc/prep
+++ b/distrib/notes/powerpc/prep
@@ -1,2 +1,2 @@
-The powerpc port boots off a boot program in an MSDOS filesystem. 
+The MACHINE port boots off a boot program in an MSDOS filesystem. 
 This is now set up by the install program and no special setup is required.
diff --git a/distrib/notes/powerpc/upgrade b/distrib/notes/powerpc/upgrade
index e58beb82840..5cfada96ce3 100644
--- a/distrib/notes/powerpc/upgrade
+++ b/distrib/notes/powerpc/upgrade
@@ -1 +1 @@
-[Upgrades may not be well supported currently for the powerpc port]
+[Upgrades may not be well supported currently for the MACHINE port]
diff --git a/distrib/notes/powerpc/whatis b/distrib/notes/powerpc/whatis
index 436ba296876..670dc4eff04 100644
--- a/distrib/notes/powerpc/whatis
+++ b/distrib/notes/powerpc/whatis
@@ -1,3 +1,3 @@
-For the powerpc, OpenBSD OSREV is a the first release of the Macintosh
+For the MACHINE, OpenBSD OSREV is a the first release of the Macintosh
 support.  This port is reasonably reliable but not yet optimized,
 and is currently improving.  Additional driver support will be added.
diff --git a/distrib/notes/powerpc/xfer b/distrib/notes/powerpc/xfer
index 96e4cd508f5..62ee0989899 100644
--- a/distrib/notes/powerpc/xfer
+++ b/distrib/notes/powerpc/xfer
@@ -44,7 +44,7 @@ following:
 	following:
 
 		cd .../OSREV		# the top of the tree
-		cd powerpc/
+		cd MACHINE/
 		tar cf <tape_device> base{:--:}OSrev etc{:--:}OSrev
 
 	(Note that you still need to fill in "<tape_device>" in the