Try to catch up with installer changes in the installation notes.

Also, the per-platform features are moved to a common place, which makes
the MD layout easier to work on. m4.common is still a tangled mess of subtly
placed dnl, though...

1 files changed, 7 insertions, 19 deletions

diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install
index 2f2d17a357c..411cfc0a3e2 100644
--- a/distrib/notes/mac68k/install
+++ b/distrib/notes/mac68k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.37 2008/08/06 20:30:08 miod Exp $
+dnl	$OpenBSD: install,v 1.38 2009/05/12 21:06:50 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSDInstallPart2
@@ -10,15 +10,9 @@ OpenBSDInstallPart2
 	Performa 476 models it is also necessary to activate the video address
 	hack. Now boot the kernel.
 
-OpenBSDBootMsgs(,"sd0")
+OpenBSDInstallPart3(,"sd0")
 
-	You will next be asked for your terminal type.  If you are
-	installing from a non-serial console, the default of "vt220"
-	is correct.  If you are installing from a serial console
-	you should choose the terminal type from amongst those listed.
-	(If your terminal type is xterm, just use vt220.)
-
-OpenBSDInstallPart3
+OpenBSDInstallPart4
 
 	Next you will have to edit or create a disk label for the disk
 	OpenBSD is being installed on.  You will first be given an
@@ -76,37 +70,31 @@ OpenBSDInstallPart3
 	OpenBSD_Swap 'b'.  For any other slice do not set any bzb value ('c')
 	except for OpenBSD_Usr, which can be set to 'g'.
 
-OpenBSDInstallPart4
+OpenBSDInstallPart5
 
 	OpenBSD/MACHINE can share a disk with Mac OS by using
 	an HFS partitioned disk. For proper layout, the disk should be
 	partitioned with Mac OS first with unused space where OpenBSD can
 	be installed.
 
-OpenBSDInstallPart5(sd0)
-
-OpenBSDInstallNet({:­CD-ROM, NFS, -:})
+OpenBSDInstallPart6({:­CD-ROM, NFS, -:})
 
 OpenBSDFTPInstall
 
 OpenBSDHTTPInstall
 
-OpenBSDTAPEInstall
-
 OpenBSDCDROMInstall
 
 OpenBSDNFSInstall
 dnl Not supported
 dnl OpenBSDDISKInstall(,{:-only -:})
 
-OpenBSDCommonFS(NFS)
+OpenBSDCommonInstall
 
-OpenBSDCommonURL
+OpenBSDTAPEInstall
 
 OpenBSDInstallWrapup
 
-OpenBSDInstallWrapupPart2
-
 Once the installation is complete, reboot into Mac OS, and start the
 BSD/Mac68k Booter again. This time, point to the OpenBSD kernel location
 on its own partition. You will have to change the kernel name to "bsd"