Clean the dust, update figures, try to be more helpful; mostly from nick@

5 files changed, 74 insertions, 33 deletions

diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index d45b1e77c43..310dc675d7f 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -1,9 +1,11 @@
+dnl	$OpenBSD: contents,v 1.33 2002/04/07 21:25:00 miod Exp $
 TopPart
 
 OpenBSDdistsets
 
 		bsd-generic.tgz The OpenBSD/MACHINE OSREV kernel binary.  
-				You MUST install this file.  It is the kernel
+				You MUST install either this file or
+				bsd-genericsbic.tgz blow.  It is the kernel
 				that you need to boot the system.
 
 		bsd-genericsbc.tgz
@@ -40,24 +42,26 @@ OpenBSDxserv(0.7,1.7)
 OpenBSDxshare(1.8,9.1)
 
 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:
+MacOS to aid the installation and configuration of OpenBSD.  The files are
+distributed in Macintosh BinHex format, which is used to make SEA (Self-
+Extracting Archive) files, which are then used to make the executables.  The
+files in this directory are as follows:
 
-	Booter1.11.1.sea.hqx
+	Booter1.11.3.sea.hqx
 		 This MacOS program is used to load the OpenBSD kernel and
 		 start the operating system.  In all cases, you will need to
 		 download this file.
-		 [ 416K binhexed, 740K uncompressed ]
+		 [ 141K binhexed, 110K SEA, 99K executable, 182K doc ]
 
-	Installer_1.2.sea.hqx
+	Installer_1.3.sea.hqx
 		 This is the MacOS program used to install downloaded sets
 		 (such as those from the bins directory) onto a BSD partition.
 		 It is necessary in either the case of a fresh install or an
 		 upgrade.
-		 [ 736K binhexed, 1.5M uncompressed ]
+		 [ 131K binhexed, 105K SEA, 165K executable ]
 
-	Mkfs_1.45.sea.hqx
+	Mkfs_1.47.sea.hqx
 		 A MacOS program to build BSD filesystems on various
 		 partitions you have created (see below).  You will need this
 		 if you are performing a new installation.
-		 [ 96K binhexed, 100K uncompressed ]
+		 [ 78K binhexed, 66K SEA, 72K executable ]
diff --git a/distrib/notes/mac68k/hardware b/distrib/notes/mac68k/hardware
index db64bdc179d..d0a7c206688 100644
--- a/distrib/notes/mac68k/hardware
+++ b/distrib/notes/mac68k/hardware
@@ -1,17 +1,19 @@
+dnl	$OpenBSD: hardware,v 1.14 2002/04/07 21:25:00 miod Exp $
 OpenBSD/MACHINE OSREV runs on several of the older Macintosh computers.
-6MB of RAM should be sufficient to boot and the system can probably
-be squeezed onto a 60MB hard disk by leaving off a package or two.
+6MB of RAM should be sufficient to boot and a minimal system can probably
+be squeezed onto a 100MB partition by installing just the minimum sets.
 To actually do much compiling or anything more interesting than
-booting, at least 8MB of RAM and more disk space is recommended.
-About 80MB will be necessary to install all of the OpenBSD OSREV binary
-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).
+booting, more RAM and disk space is highly recommended. About 250MB will be
+necessary to install all of the OpenBSD OSREV binary 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 600MB).
+A MacOS partition is also required to install OpenBSD/MACHINE OSREV and boot it,
+see below.
 
 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)
+	68030 with 68882 FPU (many Macs do not have this)
 	68040 (not including the 68LC040)
 
 The following Macintosh models are "fully" supported.  This means that at
@@ -53,8 +55,8 @@ Some systems are reportedly almost supported:
 	PowerBook 550c (but the internal SCSI drive is not supported yet)
 
 What isn't supported, but often asked about:
-	PowerPC-based Macs.  They are supported by the OpenBSD/macppc
-		port.
+	PowerPC-based Macs.  Newer Mac PPC systems are supported by the
+		OpenBSD/macppc port.
 	Machines based on Apple's IOP technology including the Mac IIfx.
 	Machines based on the 68LC040 processor.  Unfortunately, the chip
 		itself contains a major bug which is presently being worked
diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install
index 0dcf17ba195..0a2ea43c5ad 100644
--- a/distrib/notes/mac68k/install
+++ b/distrib/notes/mac68k/install
@@ -1,9 +1,11 @@
+dnl	$OpenBSD: install,v 1.19 2002/04/07 21:25:00 miod Exp $
 OpenBSDInstallPrelude
 
-The installation can be broken down into three basic steps:
+The installation can be broken down into four 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.
+	* Final system configuration.
 
 
 Preparing the filesystems:
@@ -14,11 +16,10 @@ this is selected, it will present a list of the partitions on that disk.
 Select the partition on which you wish to build a filesystem and click
 on the "Format" button.  You will now be asked for a bunch of parameters
 for the hard drive and the filesystem.  Usually, you can just take the
-defaults.  If you are installing onto a Syquest, please see the FAQ.
-Note that although this dialog only has the "OK" button, you are not
-committed, yet.  Once you get the values you want, press the "OK" button.
-A dialog will be presented at this point with two options: "Format" and
-"Cancel."  If you choose "Cancel," nothing will be written to your drive.
+defaults.  Note that although this dialog only has the "OK" button, you are
+not committed, yet.  Once you get the values you want, press the "OK"
+button. A dialog will be presented at this point with two options: "Format"
+and "Cancel." If you choose "Cancel," nothing will be written to your drive.
 If you choose "Format," the program will proceed to make a filesystem.
 
 Mkfs is not a well-behaved MacOS application.  It will not allow
@@ -101,12 +102,46 @@ 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.
-If not, correct them to your preference.  When you are satisfied with
-your choices, try booting OpenBSD.
+If not, correct them to your preference.  You will have to change the kernel
+name to "/bsd".  When you are satisfied with your choices, try booting
+OpenBSD.
 
 If you wish to save your preferences, choose the "Save Preferences"
 option in the "File" menu, then quit the application and restart.  Due
 to a long-standing bug, the preferences will not be saved unless you
-quit.
+quit.  Note that by setting the BSD/Mac68k Booter to boot automatically
+after starting, and by placing an alias to the booter in the "Startup Items"
+folder, one can make the Mac68k autoload OpenBSD upon startup.
+
+Note that on a Mac68k, the generation of the DSA and RSA keys can take quite
+some time -- on a slower system, it may take an hour or more.
+Be patient.
+
+
+Final Configuration:
+
+Unlike other OpenBSD platforms, OpenBSD/MACHINE OSREV does not configure the
+network or set a root password as part of the installation process. The user
+will have to do this after the first OpenBSD boot.  Upon first boot, root
+will have no password, just hit RETURN when prompted. You will want to set
+the root password using the passwd(1) command.
+
+To set up basic networking, you will need to create or edit the following
+files, all of which are in the /etc directory:
+	myname		the computers name (without domain).
+	mygate		the IP address of the default gateway.
+	hostname.if	Configuration of the host adapter (actual name will
+			be something like hostname.sn0 or hostname.ae0, see
+			your dmesg for your adapter name).
+	resolv.conf	Name server configuration.
+	hosts		names and IP addresses of this machine and others on
+			the network.
+	dhclient.conf	dhcp client information.
+
+Once these files are configured, your system will be very much like any
+other OpenBSD system.  'mygate' and 'myname' are just single-line  text
+files, for info on the others, see hostname.if(5), resolv.conf(5), hosts(5)
+and dhclient.conf(5) in the OpenBSD man pages.
+
 
 OpenBSDCongratulations
diff --git a/distrib/notes/mac68k/prep b/distrib/notes/mac68k/prep
index 5d01ffaabfc..09bd04f809d 100644
--- a/distrib/notes/mac68k/prep
+++ b/distrib/notes/mac68k/prep
@@ -1,3 +1,4 @@
+dnl	$OpenBSD: prep,v 1.10 2002/04/07 21:25:00 miod Exp $
 Find your favorite disk partitioning utility.  Some
 of the ones that have been tried and seem to work are:
 	APS Powertools 2.7.3
@@ -22,11 +23,11 @@ application found at <http://www.euronet.nl/users/ernstoud/hdpatch.html>.
 That done, use your favorite partitioning utility to make
 at least one A/UX "Root & Usr" partition and an A/UX "Swap"
 partition.  The "Root & Usr" partition should be _at least_
-80MB in size if you wish to install all the sets.  This partition
+250MB in size if you wish to install all the sets.  This partition
 will be the root partition of your OpenBSD system.
 
 Generally, you should allocate twice as much swap space as you have real
-memory (so, if you have 8MB of RAM, specify 16MB of swap space).
+memory (so, if you have 16MB of RAM, specify 32MB of swap space).
 Systems that will be heavily used or that are low on real
 memory should have more swap space allocated.  Systems that
 will be only lightly used can get away with less.
diff --git a/distrib/notes/mac68k/xfer b/distrib/notes/mac68k/xfer
index bdb77951bf5..d46dcd6a47f 100644
--- a/distrib/notes/mac68k/xfer
+++ b/distrib/notes/mac68k/xfer
@@ -1,9 +1,8 @@
+dnl	$OpenBSD: xfer,v 1.14 2002/04/07 21:25:00 miod Exp $
 Installation is really only supported from the local Macintosh hard drive or
 from an AppleShare volume.  This means that you'll need at least enough room
 on the HFS partition or AppleShare volume for the largest file that you will
-have to install.  There has been talk of allowing an install from split
-files. If you have the time, desire, and knowledge, please feel free to add
-that functionality.
+have to install.
 
 You will also need to collect the MacOS tools:
 	Mkfs,