- gets the installation notes more style-consistent with other arches

- remove the note about ssl27.tgz
- update the HD SC Setup url, complain about its insane length
- random cleaning

Miodspeak corrected by fries@

5 files changed, 21 insertions, 20 deletions

diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index db6859b5130..057c158090e 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -2,22 +2,22 @@ TopPart
 
 OpenBSDdistsets
 
-		bsd-generic.tgz The OpenBSD/mac68k OSREV kernel binary.  
+		bsd-generic.tgz The OpenBSD/MACHINE OSREV kernel binary.  
 				You MUST install this file.  It is the kernel
 				that you need to boot the system.
 				[ 1.4M uncompressed ]
 
 		bsd-genericsbc.tgz
-				Another OpenBSD/mac68k OSREV kernel binary.
+				Another OpenBSD/MACHINE OSREV kernel binary.
 				This is identical in every way to
 				bsd-generic.tgz accept that it enables a
 				different SCSI driver which may allow
 				some otherwise incompatible SCSI disks to
-				function with OpenBSD/mac68k.  You must
+				function with OpenBSD/MACHINE.  You must
 				install either this or bsd-generic.tgz.
 				[ 1.4M uncompressed ]
 
-		utils/		The mac68k installation utilities for MacOS.
+		utils/		The MACHINE installation utilities for MacOS.
 
 DistributionDescription(ten)
 
@@ -41,7 +41,7 @@ OpenBSDxfont(6.0M,7.3M)
 
 OpenBSDxserv(2.6M,6.3M)
 
-The directory '../OSREV/mac68k/utils' contains a number of utilities for the
+The directory '../OSREV/MACHINE/utils' contains a number of utilities for the
 MacOS to aid the installation and configuration of OpenBSD.  The files in
 this directory are as follows:
 
diff --git a/distrib/notes/mac68k/hardware b/distrib/notes/mac68k/hardware
index cac38c1a090..761fa766cf7 100644
--- a/distrib/notes/mac68k/hardware
+++ b/distrib/notes/mac68k/hardware
@@ -8,7 +8,7 @@ distribution (note that this does not count swap space!).  Much more
 disk space is required to install the source and objects as well (about
 another 105MB).
 
-OpenBSD/mac68k OSREV now runs on most 680x0 MacIntosh's.  Specifically, it
+OpenBSD/MACHINE OSREV now runs on most 680x0 MacIntosh's.  Specifically, it
 should work on:
 	68020 with 68851 PMMU and 68881 FPU
 	68030 with 68882 FPU (most Macs have this)
diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install
index 936e9140443..0dcf17ba195 100644
--- a/distrib/notes/mac68k/install
+++ b/distrib/notes/mac68k/install
@@ -1,9 +1,12 @@
+OpenBSDInstallPrelude
+
 The installation can be broken down into three basic steps:
 	* Running Mkfs to build a filesystem or filesystems.
 	* Running Install Utility to load the files onto your filesystems.
 	* Running the booter to boot the system.
 
-**** Preparing the filesystem(s)
+
+Preparing the filesystems:
 
 Double-click on the Mkfs application icon to start it up.  It will ask
 you for the SCSI ID of the drive that you are installing upon.  Once
@@ -29,14 +32,15 @@ Repeat as necessary for any extra partitions that you wish to make
 filesystems on.  Note that you do _not_ need a filesystem on your swap
 partition.
 
-**** Installing the files
+
+Installing the distribution sets:
 
 Double-click on the Install Utility icon to start it up.  The installer
 will present the same SCSI ID menu that mkfs did.  Select the same SCSI
 ID that you did for mkfs--i.e., the one you are installing onto.
 
 If you are installing onto a single root partition, proceed to the
-"Installation of base files" section, below.
+"Installing the base files" section, below.
 
 	If you have not created filesystems for the root, usr, and
 	any other partitions, go back to "Preparing the filesystem(s),"
@@ -73,6 +77,7 @@ If you are installing onto a single root partition, proceed to the
 		* Type "quit" to exit the minishell after you have mounted
 		  all the filesystems.
 
+
 Installation of base files:
 
 	Select the "Install" menu item from the "File" menu and install
@@ -91,15 +96,8 @@ Installation of base files:
 	device nodes for you in /dev and your initial /etc/fstab.  The
 	installer program also has an option to give you a mini-shell.
 
-	You may have noticed in other versions of OpenBSD that adding the
-	ssl{:--:}OSrev.tgz is supported from the installer. This is
-	unfortunately *not* the case for the macintosh installer, as the
-	ssl package will not extract in the correct directory when extracted
-	with the macintosh installation tool. Instead, should install this
-	package *after* you install your system using pkg_add(8). please
-	see afterboot(8) for details on how to do this.
 
-**** Booting the system
+Booting the system:
 
 Double-click on the BSD/Mac68k Booter icon to start the application.  Check
 that the options in the Booting dialog look sane--especially the SCSI ID.
diff --git a/distrib/notes/mac68k/prep b/distrib/notes/mac68k/prep
index 509c85e468b..5d01ffaabfc 100644
--- a/distrib/notes/mac68k/prep
+++ b/distrib/notes/mac68k/prep
@@ -7,8 +7,11 @@ of the ones that have been tried and seem to work are:
 	I/O Formatter from Diversified (?)
 	Silverlining from LaCie
 
-You can get "HD SC Setup" from <ftp://ftphqx.info.apple.com/Apple_Support_Area/
-Apple_Software_Updates/US/Macintosh/Utilities/Apple_HD_SC_Setup_7.3.5.sea.hqx>.
+You can get "HD SC Setup" from
+	ftp://ftphqx.info.apple.com/Apple_Support_Area/
+	    Apple_Software_Updates/English-North_American/Macintosh/Utilities/
+	    Apple_HD_SC_Setup_7.3.5.sea.bin
+(this address has been split into several lines for readability).
 This utility ignores non-Apple hard disks unless you patch it with the 
 application found at <http://www.euronet.nl/users/ernstoud/hdpatch.html>.
 
diff --git a/distrib/notes/mac68k/whatis b/distrib/notes/mac68k/whatis
index c37f65c4f84..fb41fb0ff47 100644
--- a/distrib/notes/mac68k/whatis
+++ b/distrib/notes/mac68k/whatis
@@ -1,4 +1,4 @@
-OpenBSD OSREV is a port to the old Macintosh (680x0-based)
+OpenBSD/MACHINE OSREV is a port to the old Macintosh (680x0-based)
 computers.  As always, there is much to be done on this 
 architecture, and help is very much appreciated.  However,
 a wide variety of hardware and software is completely