Your spring jumbo m4-fu. This time:

- mention comp contains an objective-C compiler too.
- rewrite InstallPrelude so that it will only output the ``know your drive
  geometry'' blurb if asked to, and for a specified disk type. Use it for
  non-IDE and non-SCSI disks only, otherwise the kernel is good enough to
  do the job without the users' help.
- similarily, adapt BootMsgs to make the second part of the geometry blurb
  optional, and to accept up to three disk types. Use this to report better
  disk names (i.e. no point saying an scsi disk would show up as sd0 on
  platforms which can't have scsi disks, or won't be able to boot from them).
- in InstallPart4, drop the part about block and fragment sizes in
  disklabel. The defaults are good, and you won't get to change them unless
  you switched to expert mode.
- the default answer to ``wanna get the ftp mirror list, unzel?'' is ``no'',
  so pressing enter to get it is not enough anymore (-:

19 files changed, 126 insertions, 135 deletions

diff --git a/distrib/notes/alpha/install b/distrib/notes/alpha/install
index ac15fd5e51b..4f4c7968e73 100644
--- a/distrib/notes/alpha/install
+++ b/distrib/notes/alpha/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.28 2006/02/15 12:46:47 martin Exp $
+dnl	$OpenBSD: install,v 1.29 2007/03/01 19:24:45 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk.  The easiest way is
@@ -119,7 +119,7 @@ OpenBSDBootMsgs
 	you should choose the terminal type from amongst those listed.
 	(If your terminal type is xterm, just use vt220.)
 
-OpenBSDInstallPart3({:- or "wd0" for IDE drives-:})
+OpenBSDInstallPart3
 
 OpenBSDInstallPart4
 
diff --git a/distrib/notes/amd64/install b/distrib/notes/amd64/install
index 27e6347b70b..ec3efdfe331 100644
--- a/distrib/notes/amd64/install
+++ b/distrib/notes/amd64/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.6 2005/03/18 23:40:35 miod Exp $
+dnl	$OpenBSD: install,v 1.7 2007/03/01 19:24:45 miod Exp $
 OpenBSDInstallPrelude
 
 If OpenBSD will be sharing the disk with another operating system,
@@ -50,7 +50,7 @@ OpenBSDBootMsgs
 	You will next be asked for your terminal type.  You should just
 	hit return to select the default (vt220).
 
-OpenBSDInstallPart3({:- or "wd0" for IDE/RLL/ESDI/ST506 drives-:})
+OpenBSDInstallPart3
 
 	Next you will have to edit or create a disk label for the disk
 	OpenBSD is being installed on.  If there are any existing
diff --git a/distrib/notes/armish/install b/distrib/notes/armish/install
index 6e4d331c719..444d2d0cccd 100644
--- a/distrib/notes/armish/install
+++ b/distrib/notes/armish/install
@@ -1,16 +1,14 @@
-dnl	$OpenBSD: install,v 1.2 2006/10/14 18:40:32 krw Exp $
+dnl	$OpenBSD: install,v 1.3 2007/03/01 19:24:45 miod Exp $
 OpenBSDInstallPrelude
 
-Write some good explaination here...
-
 OpenBSDInstallPart2
 
-OpenBSDBootMsgs
+OpenBSDBootMsgs(,"wd0")
 
 	You will next be asked for your terminal type.  You should just
 	hit return to select the default (vt220).
 
-OpenBSDInstallPart3({:- or "wd0" for IDE drives-:})
+OpenBSDInstallPart3
 
 	Next you will have to edit or create a disk label for the disk
 	OpenBSD is being installed on.  If there are any existing
diff --git a/distrib/notes/cats/install b/distrib/notes/cats/install
index aae5ade9db0..fe75f791203 100644
--- a/distrib/notes/cats/install
+++ b/distrib/notes/cats/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.6 2004/03/16 08:24:59 jmc Exp $
+dnl	$OpenBSD: install,v 1.7 2007/03/01 19:24:45 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk.  The easiest way
@@ -15,12 +15,12 @@ been detected, be sure to put a disk in the tray, and reset the machine.
 
 OpenBSDInstallPart2
 
-OpenBSDBootMsgs
+OpenBSDBootMsgs(,"wd0")
 
 	You will next be asked for your terminal type.  You should just
 	hit return to select the default (vt220).
 
-OpenBSDInstallPart3({:- or "wd0" for IDE drives-:})
+OpenBSDInstallPart3
 
 	Next you will have to edit or create a disk label for the disk
 	OpenBSD is being installed on.  If there are any existing
diff --git a/distrib/notes/hp300/install b/distrib/notes/hp300/install
index e534e6ce548..a31773c9be4 100644
--- a/distrib/notes/hp300/install
+++ b/distrib/notes/hp300/install
@@ -1,5 +1,5 @@
-dnl	$OpenBSD: install,v 1.31 2007/03/01 19:16:16 miod Exp $
-OpenBSDInstallPrelude
+dnl	$OpenBSD: install,v 1.32 2007/03/01 19:24:45 miod Exp $
+OpenBSDInstallPrelude({:-HP-IB disks-:})
 dnl No extra line, this has to stick to the geometry notes paragraph.
 
 The ramdisk kernel may be loaded from the network, from CD-ROM, or other
@@ -90,8 +90,8 @@ OpenBSDInstallPart2
 	either your boot media is bad, your diskless setup is incorrect,
 	or you may have a hardware or configuration problem.
 
-
-OpenBSDBootMsgs
+OpenBSDBootMsgs(warn,{:-"sd0" for SCSI drives-:},{:-or "hd0" for HP-IB
+	drives-:})
 
 	You will next be asked for your terminal type.  There are only
 	a few specific terminal types supported.  If you are using a
@@ -100,7 +100,7 @@ OpenBSDBootMsgs
 	or vt100 compatible terminal; nothing else is supported.  (If
 	your terminal type is xterm, just use vt100.)
 	
-OpenBSDInstallPart3({:- or "hd0" for HP-IB/CS80 drives-:})
+OpenBSDInstallPart3
 
 OpenBSDInstallPart4
 
diff --git a/distrib/notes/hppa/install b/distrib/notes/hppa/install
index d0d7efa5133..0de7c2b8656 100644
--- a/distrib/notes/hppa/install
+++ b/distrib/notes/hppa/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.13 2005/08/30 17:05:31 miod Exp $
+dnl	$OpenBSD: install,v 1.14 2007/03/01 19:24:45 miod Exp $
 dnl lots of texts coming from {mac68k,mvme68k,vax}/install initially
 OpenBSDInstallPrelude
 
@@ -118,7 +118,7 @@ OpenBSDInstallPart2
 	media is bad, your diskless setup is incorrect, or you may have
 	a hardware or configuration problem.
 
-OpenBSDBootMsgs
+OpenBSDBootMsgs(,"sd0")
 
 	You will next be asked for your terminal type.  If you are
 	installing from a non-serial console, the default of "vt100"
diff --git a/distrib/notes/i386/install b/distrib/notes/i386/install
index 088fa0c670e..90087857ce6 100644
--- a/distrib/notes/i386/install
+++ b/distrib/notes/i386/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.38 2004/09/10 19:14:05 miod Exp $
+dnl	$OpenBSD: install,v 1.39 2007/03/01 19:24:45 miod Exp $
 OpenBSDInstallPrelude
 
 If OpenBSD will be sharing the disk with DOS or another operating
@@ -45,13 +45,12 @@ OpenBSDInstallPart2
 	you do, please {:-include-:} as many details about your system
 	configuration as you can.
 
-
 OpenBSDBootMsgs
 
 	You will next be asked for your terminal type.  You should just
 	hit return to select the default (vt220).
 
-OpenBSDInstallPart3({:- or "wd0" for IDE/RLL/ESDI/ST506 drives-:})
+OpenBSDInstallPart3
 
 	Next you will have to edit or create a disk label for the disk
 	OpenBSD is being installed on.  If there are any existing
diff --git a/distrib/notes/landisk/install b/distrib/notes/landisk/install
index 5e15f7c57f0..91f9a97d33c 100644
--- a/distrib/notes/landisk/install
+++ b/distrib/notes/landisk/install
@@ -1,19 +1,17 @@
-dnl	$OpenBSD: install,v 1.2 2007/02/28 22:30:05 miod Exp $
-OpenBSDInstallShortPrelude
+dnl	$OpenBSD: install,v 1.3 2007/03/01 19:24:10 miod Exp $
+OpenBSDInstallPrelude
 
 OpenBSDInstallPart2
 
 	If you have copied the miniroot image to the disk, it will
 	boot automatically upon power-up.
 
-	Once the kernel has loaded, you will be presenteh with the
-	OpenBSD kernel boot messages.
+OpenBSDBootMsgs(,"wd0")
 
 	You will next be asked for your terminal type.  You should just
 	hit return to select the default (vt220).
 
-OpenBSDInstallPart3({:-, such as external USB drives,  or "wd0"
-	for IDE drives, such as the boot disk-:})
+OpenBSDInstallPart3({:-"wd0" for IDE drives-:})
 
 	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
diff --git a/distrib/notes/luna88k/install b/distrib/notes/luna88k/install
index 6b57cffdf72..a07ea1af375 100644
--- a/distrib/notes/luna88k/install
+++ b/distrib/notes/luna88k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.3 2005/03/21 22:32:06 miod Exp $
+dnl	$OpenBSD: install,v 1.4 2007/03/01 19:24:45 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -75,7 +75,7 @@ OpenBSDInstallPart2
 	diskless setup isn't correct, or you may have a hardware or
 	configuration problem.
 
-OpenBSDBootMsgs
+OpenBSDBootMsgs(,"sd0")
 
 	You will next be asked for your terminal type.  You should choose
 	the terminal type from amongst those listed.
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index 3f4e6fa804b..b020c3e20ff 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.70 2007/02/28 22:30:02 miod Exp $
+dnl	$OpenBSD: m4.common,v 1.71 2007/03/01 19:24:43 miod Exp $
 dnl
 dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -116,10 +116,10 @@ dnl Describes baseXX.tgz. Put ``shared'' as third argument if shared libraries
 dnl are available.
 dnl
 define({:-OpenBSDbase-:},
-{:-	base{:--:}OSrev	 The OpenBSD/MACHINE OSREV base binary distribution.  You
-		 MUST install this distribution set.  It contains the
-		 base OpenBSD utilities that are necessary for the
-		 system to run and be minimally functional.
+{:-	base{:--:}OSrev	 The OpenBSD/MACHINE OSREV base binary distribution.  You MUST
+		 install this distribution set.  It contains the base OpenBSD
+		 utilities that are necessary for the system to run and be
+		 minimally functional.
 		 ifelse(X$3,Xshared,{:-It includes shared library support, and excludes
 		 everything described below.-:},{:-It excludes everything described below.-:})showsize($1,$2)-:})dnl
 dnl
@@ -129,15 +129,15 @@ dnl Describes compXX.tgz. Put ``shared'' as third argument if shared libraries
 dnl are available.
 dnl
 define({:-OpenBSDcomp-:},
-{:-	comp{:--:}OSrev	 The OpenBSD/MACHINE Compiler tools.  All of the tools
-		 relating to C, C++, and fortran are supported. This set
-		 includes the system {:-include-:} files (/usr/{:-include-:}), the
-		 linker, the compiler tool chain, and the various system
-		 libraries{:--:}ifelse(X$3,Xshared,{:- (except the shared libraries, which are
-		 included as part of the base set).-:},.)
-		 This set also includes the manual pages for all
-		 of the utilities it contains, as well as the system
-		 call and library manual pages.showsize($1,$2)-:})dnl
+{:-	comp{:--:}OSrev	 The OpenBSD/MACHINE Compiler tools.  All of the tools relating
+		 to C, C++, Objective-F and Fortran are supported.  This set
+		 includes the system {:-include-:} files (/usr/{:-include-:}), the linker,
+		 the compiler tool chain, and the various system libraries{:--:}ifelse(X$3,Xshared,{:-
+		 (except the shared libraries, which are included as part of
+		 the base set).-:},.)
+		 This set also includes the manual pages for all of the
+		 utilities it contains, as well as the system call and library
+		 manual pages.showsize($1,$2)-:})dnl
 dnl
 dnl
 dnl OpenBSDetc( compressed size, uncompressed size [, noupgrade])
@@ -148,7 +148,7 @@ define({:-OpenBSDetc-:},
 		 files that reside in /etc and in several other places.
 		 This set MUST be installed{:--:}ifelse(X$3,X,{:- if you are installing the
 		 system from scratch, but should NOT be used if you are
-		 upgrading. (If you are upgrading, it's recommended that
+		 upgrading.  (If you are upgrading, it's recommended that
 		 you get a copy of this set and CAREFULLY upgrade your
 		 configuration files by hand; see the section named 
 		 Upgrading a previously-installed OpenBSD System" below.)-:},.)showsize($1,$2)-:})dnl
@@ -165,8 +165,8 @@ dnl OpenBSDman( compressed size, uncompressed size )
 dnl Describes manXX.tgz.
 dnl
 define({:-OpenBSDman-:},
-{:-	man{:--:}OSrev	 This set includes all of the manual pages for the
-		 binaries and other software contained in the base set.
+{:-	man{:--:}OSrev	 This set includes all of the manual pages for the binaries
+		 and other software contained in the base set.
 		 Note that it does not {:-include-:} any of the manual pages
 		 that are included in the other sets.showsize($1,$2)-:})dnl
 dnl
@@ -175,8 +175,8 @@ dnl OpenBSDmisc( compressed size, uncompressed size )
 dnl Describes miscXX.tgz.
 dnl
 define({:-OpenBSDmisc-:},
-{:-	misc{:--:}OSrev	 This set includes the system dictionaries (which are
-		 rather large), and the typesettable document set.showsize($1,$2)-:})dnl
+{:-	misc{:--:}OSrev	 This set includes the system dictionaries (which are rather
+		 large), and the typesettable document set.showsize($1,$2)-:})dnl
 dnl
 dnl
 dnl OpenBSDxbase( compressed size, uncompressed size )
@@ -192,15 +192,15 @@ dnl Describes xetcXX.tgz.
 dnl
 define({:-OpenBSDxetc-:},
 {:-	xetc{:--:}OSrev	 This set includes the X window system configuration files
-		 that reside in /etc. It's the equivalent of etc{:--:}OSrev for X.showsize($1,$2)-:})dnl
+		 that reside in /etc.  It's the equivalent of etc{:--:}OSrev for X.showsize($1,$2)-:})dnl
 dnl
 dnl
 dnl OpenBSDxshare( compressed size, uncompressed size )
 dnl Describes xshareXX.tgz.
 dnl
 define({:-OpenBSDxshare-:},
-{:-	xshare{:--:}OSrev This set includes all text files equivalent between
-		 all architectures.showsize($1,$2)-:})dnl
+{:-	xshare{:--:}OSrev This set includes all text files equivalent between all
+		 architectures.showsize($1,$2)-:})dnl
 dnl
 dnl
 dnl OpenBSDxfont( compressed size, uncompressed size )
@@ -271,27 +271,26 @@ dnl
 dnl ========== Various Install Instructions
 dnl (usually used by arch/install)
 dnl
-dnl Short or longer installation introduction. The longer version warns
-dnl about disk geometry hell.
-define({:-OpenBSDInstallShortPrelude-:},
+dnl OpenBSDInstallPrelude(troublesome disk types)
+dnl
+dnl Installation introduction. Warns about disk geometry hell if argument
+dnl is not empty.
+define({:-OpenBSDInstallPrelude-:},
 {:-Installing OpenBSD is a relatively complex process, but if you have
 this document in hand and are careful to read and remember the
 information which is presented to you by the install program, it
-shouldn't be too much trouble.-:})dnl
-dnl
-define({:-OpenBSDInstallPrelude-:},
-{:-OpenBSDInstallShortPrelude
-
-Before you begin, you should know the geometry of your hard disk, i.e.
-the sector size (note that sector sizes other than 512 bytes are not
-currently supported), the number of sectors per track, the number of
-tracks per cylinder (also known as the number of heads), and the
-number of cylinders on the disk.  The OpenBSD kernel will try to
-discover these parameters on its own, and if it can it will print them
-at boot time.  If possible, you should use the parameters it prints.
-(You might not be able to because you're sharing your disk with
-another operating system, or because your disk is old enough that the
-kernel can't figure out its geometry.)-:})dnl
+shouldn't be too much trouble.ifelse(X$1,X,,{:-
+
+If the disks connected to your machine are $1,
+it is recommended that you know their geometry, i.e. the sector size (note
+that sector sizes other than 512 bytes are not currently supported), the
+number of sectors per track, the number of tracks per cylinder (also known
+as the number of heads), and the number of cylinders on the disk.  The
+OpenBSD kernel will try to discover these parameters on its own, and if it
+can it will print them at boot time.  If possible, you should use the
+parameters it prints.  (You might not be able to because you're sharing your
+disk with another operating system, or because your disk is old enough that
+the kernel can't figure out its geometry.)-:})-:})dnl
 dnl
 dnl OpenBSDInstallPart2
 dnl Describes the beginning of the installation process, once the
@@ -309,23 +308,28 @@ may be a better option, or at any prompt enter '!' to get a shell,
 from which 'exit' will return you back to that prompt (no refresh
 of the prompt though).-:})dnl
 dnl
-dnl OpenBSDBootMsgs
-dnl Describes the boot of the ramdisk.
+dnl OpenBSDBootMsgs(warn geometry, disk type, disk type, disk type)
+dnl
+dnl Describes the boot of the ramdisk, the expected disk devices
+dnl names, and warns bore the reader with geometry concerns if the
+dnl second argument is not empty.
 define({:-OpenBSDBootMsgs-:},
 {:-	Once the kernel has loaded, you will be presented with the
 	OpenBSD kernel boot messages.  You will want to read them
-	to determine your disk's name and geometry.  Its name will
-	be something like "sd0" or "wd0" and the geometry will be
-	printed on a line that begins with its name.  As mentioned
-	above, you will need your disk's geometry when creating
-	OpenBSD partitions.  You will also need to know the device
-	name to tell the install tools what disk to install on. If
-	you cannot read the messages as they scroll by, do not
-	worry -- you can get at this information later inside the
-	install program.-:})dnl
-dnl
-dnl OpenBSDInstallPart3(alternate common disk type description)
-dnl Describes the beginning of the bsd.rd operation
+	to determine your disks name and geometry.  Its name will
+	be something like ifelse(X$2,X,{:-"sd0" for SCSI drives, or "wd0" for IDE
+	drives-:},$2){:--:}ifelse(X$3,X,,{:-, $3-:}){:--:}ifelse(X$4,X,,{:-, $4-:}){:--:}.{:--:}ifelse(X$1,X,,{:-
+	As mentioned above, you will need your disks geometry (which
+	will be printed on a line beginning with its name) when
+	creating OpenBSD partitions.-:})
+	You will also need to know the device name to tell the
+	install tools what disk to install on.  If you cannot read
+	the messages as they scroll by, do not worry -- you can get
+	at this information later inside the install program.-:})dnl
+dnl
+dnl OpenBSDInstallPart3
+dnl
+dnl Describes the beginning of the bsd.rd operation.
 dnl
 define({:-OpenBSDInstallPart3-:},
 {:-	After entering the terminal type you will be asked whether you
@@ -336,9 +340,7 @@ define({:-OpenBSDInstallPart3-:},
 	you really wish to install (or upgrade).  Assuming you
 	answered yes, the install program will then tell you which
 	disks of that type it can install on, and ask you which it
-	should use.  The name of the disk is typically "sd0" for
-	SCSI drives$2.
-	Reply with the name of your disk.-:})dnl
+	should use.  Reply with the name of your disk.-:})dnl
 dnl
 dnl OpenBSDInstallPart4(mention about other OS partitions)
 dnl Describes the disklabel operation
@@ -366,8 +368,6 @@ dnl More disklabel notes(disk)
 define({:-OpenBSDInstallPart5-:},
 {:-	The swap partition (usually 'b') should have a type of "swap", all
 	other native OpenBSD partitions should have a type of "4.2BSD".
-	Block and fragment sizes are usually 8192 and 1024 bytes, but can
-	also be 4096 and 512 or even 16384 and 2048 bytes.
 
 	The install program will now label your disk and ask which file
 	systems should be created on which partitions.  It will auto-
@@ -402,7 +402,7 @@ define({:-OpenBSDInstallNet-:},
 	Next the system will give you a list of network interfaces you can
 	configure.  For each network interface you select to configure, it
 	will ask for the IP address to use, the symbolic host name to use,
-	the netmask to use, and any interface-specific flags to set. The
+	the netmask to use, and any interface-specific flags to set.  The
 	interface-specific flags are usually used to determine which media
 	the network card is to use.  Typically no media flags are required
 	as autodetection normally works, but you will be prompted with a
@@ -449,8 +449,8 @@ define({:-OpenBSDFTPInstall-:},
 		    3) The IP address (or hostname if you enabled
 		       DNS earlier in the install) of an FTP server
 		       carrying the OpenBSD OSREV distribution.
-		       If you don't know, just hit return when
-		       asked if you want to see a list of such hosts.
+		       If you don't know, answer ``y'' when asked if
+		       you want to see a list of such hosts.
 		    4) The FTP directory holding the distribution sets.
 		       The default value of pub/OpenBSD/OSREV/MACHINE
 		       is almost always correct.
@@ -473,8 +473,8 @@ define({:-OpenBSDHTTPInstall-:},
 		    2) The IP address (or hostname if you enabled
 		       DNS earlier in the install) of an HTTP server
 		       carrying the OpenBSD OSREV distribution.
-		       If you don't know, just hit return when
-		       asked if you want to see a list of such hosts.
+		       If you don't know, answer ``y'' when asked if
+		       you want to see a list of such hosts.
 		    3) The directory holding the distribution sets.
 		       There is no standard location for this;
 		       You should use the directory specified
@@ -681,7 +681,7 @@ dnl OpenBSDUpgrade({:-<list of available boot methods>-:})dnl
 dnl Parameter is optional.
 define({:-OpenBSDUpgrade-:},
 {:-Warning! Upgrades to OpenBSD OSREV are currently only supported from the
-immediately previous release. The upgrade process will also work with older
+immediately previous release.  The upgrade process will also work with older
 releases, but might not execute some migration tasks that would be necessary
 for a proper upgrade.  The best solution, whenever possible, is to backup
 your data and reinstall from scratch.
@@ -739,11 +739,11 @@ define({:-OpenBSDXferFloppyFromDOS-:},
 {:-Creating a bootable floppy disk using DOS/Windows:
 
 	First you need to get access to the OpenBSD bootable floppy
-	images. If you can access the distribution from the CD-ROM under
+	images.  If you can access the distribution from the CD-ROM under
 	DOS, you will find the bootable disks in the OSREV/MACHINE
-	directory. Otherwise, you will have to download them from one of
+	directory.  Otherwise, you will have to download them from one of
 	the OpenBSD FTP or HTTP mirror sites, using an FTP client or a web
-	browser. In either case, take care to do "binary" transfers, since
+	browser.  In either case, take care to do "binary" transfers, since
 	these are images files and any DOS cr/lf translations or control/z
 	EOF interpretations will result in corrupted transfers.
 	
@@ -892,7 +892,7 @@ ifelse(X$4,X,,{:-		dd of=${TAPE} if=$4
 	cd .../OSREV/MACHINE
 	sh -x /tmp/maketape
 
-        Note that, by default, this script creates a bootable tape. If
+        Note that, by default, this script creates a bootable tape.  If
 	you only want to fetch the OpenBSD files from tape, but want to
 	boot from another device, you can save time and space creating
 	the tape this way:
@@ -957,7 +957,7 @@ the following:
 	is recommended that you upgrade the other sets, as well.-:})dnl
 dnl
 define({:-OpenBSDInstNFS-:},
-{:-Now you must populate the `/dev' directory for your client. If the server
+{:-Now you must populate the `/dev' directory for your client.  If the server
 does not run OpenBSD you might save the MAKEDEV output:
 
 	eo=echo ksh MAKEDEV all > all.sh
@@ -966,7 +966,7 @@ and then tailor it for your server operating system before running it.  Note
 that MAKEDEV is written specifically for ksh, and may not work on any other
 Bourne shell.
 
-There will be error messages about unknown users and groups. These errors are
-inconsequential for the purpose of installing OpenBSD. However, you may
-want to correct them if you plan to use the diskless setup regularly. In that
+There will be error messages about unknown users and groups.  These errors are
+inconsequential for the purpose of installing OpenBSD.  However, you may
+want to correct them if you plan to use the diskless setup regularly.  In that
 case, you may re-run MAKEDEV on your OpenBSD machine once it has booted.-:})dnl
diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install
index 8de2cb6fa7e..f3a72043c85 100644
--- a/distrib/notes/mac68k/install
+++ b/distrib/notes/mac68k/install
@@ -1,5 +1,5 @@
-dnl	$OpenBSD: install,v 1.33 2006/06/10 06:46:41 martin Exp $
-OpenBSDInstallShortPrelude
+dnl	$OpenBSD: install,v 1.34 2007/03/01 19:24:45 miod Exp $
+OpenBSDInstallPrelude
 
 OpenBSDInstallPart2
 
@@ -10,7 +10,7 @@ OpenBSDInstallPart2
 	Performa 476 models it is also necessary to activate the video address
 	hack. Now boot the kernel.
 
-OpenBSDBootMsgs
+OpenBSDBootMsgs(,"sd0")
 
 	You will next be asked for your terminal type.  You should choose
 	the terminal type from amongst those listed.
diff --git a/distrib/notes/macppc/install b/distrib/notes/macppc/install
index b1fb2089473..c635823914e 100644
--- a/distrib/notes/macppc/install
+++ b/distrib/notes/macppc/install
@@ -1,5 +1,5 @@
-dnl	$OpenBSD: install,v 1.23 2004/05/24 15:47:00 tom Exp $
-OpenBSDInstallShortPrelude
+dnl	$OpenBSD: install,v 1.24 2007/03/01 19:24:45 miod Exp $
+OpenBSDInstallPrelude
 
 Before you begin, you should decide if OpenBSD is to be installed
 on the whole disk or share the disk with Mac OS.
@@ -33,12 +33,12 @@ OpenBSDInstallPart2
 	(Refer to "Preparing your System for OpenBSD Installation" above
 	 for information on how to access and boot from Open Firmware.)
 
-OpenBSDBootMsgs
+OpenBSDBootMsgs(,"wd0")
 
 	You will next be asked for your terminal type.  You should just
 	hit return to select the default (vt220).
 
-OpenBSDInstallPart3({:- or "wd0" for IDE/ATA drives-:})
+OpenBSDInstallPart3
 
 	Next you will have to edit or create a disk label for the disk
 	OpenBSD is being installed on.  If there are any existing
diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install
index 0f6f7fe4913..b3ee934a3d7 100644
--- a/distrib/notes/mvme68k/install
+++ b/distrib/notes/mvme68k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.28 2005/03/21 22:32:06 miod Exp $
+dnl	$OpenBSD: install,v 1.29 2007/03/01 19:24:45 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -240,7 +240,7 @@ OpenBSDInstallPart2
 	diskless setup isn't correct, or you may have a hardware or
 	configuration problem.
 
-OpenBSDBootMsgs
+OpenBSDBootMsgs(,"sd0")
 
 	You will next be asked for your terminal type.  You should choose
 	the terminal type from amongst those listed.
diff --git a/distrib/notes/mvme88k/install b/distrib/notes/mvme88k/install
index 909db9942a0..a01b362e58a 100644
--- a/distrib/notes/mvme88k/install
+++ b/distrib/notes/mvme88k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.19 2005/03/21 22:32:06 miod Exp $
+dnl	$OpenBSD: install,v 1.20 2007/03/01 19:24:45 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -214,7 +214,7 @@ OpenBSDInstallPart2
 	diskless setup isn't correct, or you may have a hardware or
 	configuration problem.
 
-OpenBSDBootMsgs
+OpenBSDBootMsgs(,"sd0")
 
 	You will next be asked for your terminal type.  You should choose
 	the terminal type from amongst those listed.
diff --git a/distrib/notes/sgi/install b/distrib/notes/sgi/install
index cee0906d64f..c855d946582 100644
--- a/distrib/notes/sgi/install
+++ b/distrib/notes/sgi/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.8 2005/08/30 17:05:32 miod Exp $
+dnl	$OpenBSD: install,v 1.9 2007/03/01 19:24:45 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -53,7 +53,7 @@ OpenBSDInstallPart2
 	diskless setup isn't correct, or you may have a hardware or
 	configuration problem.
 
-OpenBSDBootMsgs
+OpenBSDBootMsgs(,"sd0")
 
 	You will next be asked for your terminal type.
 dnl XXX needs extra text here once graphics console is available
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index 915a9acfb95..7687598522a 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -1,5 +1,5 @@
-dnl	$OpenBSD: install,v 1.64 2005/04/27 03:07:16 jsg Exp $
-OpenBSDInstallPrelude
+dnl	$OpenBSD: install,v 1.65 2007/03/01 19:24:45 miod Exp $
+OpenBSDInstallPrelude({:-SMD disks-:})
 
 There are several ways to install OpenBSD onto a disk. The easiest way
 in terms of preliminary setup is to use the OpenBSD miniroot that can
@@ -172,14 +172,9 @@ OpenBSDInstallPart2
 	is bad, your diskless setup isn't correct, or you may have
 	a hardware or configuration problem.
 
-OpenBSDBootMsgs
-
-	While booting, you will probably see several warnings.  You
-	may be warned that the kernel can't figure out what device
-	it booted from.  Do not be alarmed, this is completely normal.
-	This warning occurs because while OpenBSD/MACHINE can boot from
-	the floppy drive, the kernel itself lacks a floppy driver for some
-	MACHINE models.
+OpenBSDBootMsgs(SMD drives are noisy and weight a ton per kilobyte and scare
+		cats,"sd0" for SCSI drives,{:-and "xd0" or "xy0"
+	for SMD drives-:})
 
 	You will next be asked for your terminal type.  If you are
 	installing from a keyboard/monitor console, the default of
diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install
index 88d83dff2f8..ce0cd27448a 100644
--- a/distrib/notes/sparc64/install
+++ b/distrib/notes/sparc64/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.38 2005/08/10 01:38:48 brad Exp $
+dnl	$OpenBSD: install,v 1.39 2007/03/01 19:24:45 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -120,11 +120,11 @@ OpenBSDBootMsgs
 	you should choose the terminal type from amongst those listed.
 	(If your terminal type is xterm, just use vt100.)
 
-OpenBSDInstallPart3({:- or "wd0" for IDE drives-:})
+OpenBSDInstallPart3
 
 OpenBSDInstallPart4
 
-OpenBSDInstallPart5(sd0)
+OpenBSDInstallPart5(wd0)
 
 OpenBSDInstallNet({:-CD-ROM, -:},nofloppy)
 
diff --git a/distrib/notes/vax/install b/distrib/notes/vax/install
index 321a069037b..808af9897e0 100644
--- a/distrib/notes/vax/install
+++ b/distrib/notes/vax/install
@@ -1,5 +1,5 @@
-dnl	$OpenBSD: install,v 1.18 2006/08/14 13:23:19 miod Exp $
-OpenBSDInstallPrelude
+dnl	$OpenBSD: install,v 1.19 2007/03/01 19:24:45 miod Exp $
+OpenBSDInstallPrelude({:-MSCP or other non-SCSI disks-:})
 
 For most systems, the easiest way to install OpenBSD/MACHINE OSREV is via
 diskless booting over an Ethernet network.  You will need both the
@@ -90,7 +90,8 @@ OpenBSDInstallPart2
 	hardware or configuration problem.
 
 
-OpenBSDBootMsgs
+OpenBSDBootMsgs(the quick brown vax jumped over the lazy pdp,"sd0" for SCSI drives,{:-"ra0" for MSCP
+	drives-:}, or "hd0" for MFM drives)
 
 	You will next be asked for your terminal type.
 	If you are installing from a serial console you should choose
diff --git a/distrib/notes/zaurus/install b/distrib/notes/zaurus/install
index a12ee881473..1b6b6369396 100644
--- a/distrib/notes/zaurus/install
+++ b/distrib/notes/zaurus/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.18 2006/04/04 00:26:33 uwe Exp $
+dnl	$OpenBSD: install,v 1.19 2007/03/01 19:24:45 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSD is installed on the Zaurus by effectively converting
@@ -80,12 +80,12 @@ partition on the C3x00 hard drive, you can instead use
 
 OpenBSDInstallPart2
 
-OpenBSDBootMsgs
+OpenBSDBootMsgs(,"wd0")
 
 	You will next be asked for your terminal type.  You should just
 	hit return to select the default (vt220).
 
-OpenBSDInstallPart3({:- or "wd0" for IDE drives-:})
+OpenBSDInstallPart3
 
 	Next you will have to edit or create a disk label for the disk
 	OpenBSD is being installed on.  If there are any existing