19 files changed, 233 insertions, 120 deletions
diff --git a/distrib/notes/alpha/install b/distrib/notes/alpha/install
index 0f3701632f9..ac7fbc1e496 100644
--- a/distrib/notes/alpha/install
+++ b/distrib/notes/alpha/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.30 2008/03/10 21:27:33 miod Exp $
+dnl	$OpenBSD: install,v 1.31 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk.  The easiest way is
@@ -142,4 +142,12 @@ OpenBSDCommonFS
 
 OpenBSDCommonURL
 
+OpenBSDInstallWrapup
+
+OpenBSDInstallAperture
+
+OpenBSDInstallConsole
+
+OpenBSDInstallWrapupPart2
+
 OpenBSDCongratulations
diff --git a/distrib/notes/amd64/install b/distrib/notes/amd64/install
index 634e23a9741..3eab9fd9300 100644
--- a/distrib/notes/amd64/install
+++ b/distrib/notes/amd64/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.8 2008/03/10 21:38:27 miod Exp $
+dnl	$OpenBSD: install,v 1.9 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude
 
 If OpenBSD will be sharing the disk with another operating system,
@@ -6,10 +6,7 @@ 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.
+your OpenBSD partitions.
 
 There are several ways to install OpenBSD onto a disk.  The easiest way,
 should your computer support it, is to boot off the OpenBSD CD-ROM, or
@@ -98,4 +95,12 @@ OpenBSDCommonFS
 
 OpenBSDCommonURL
 
+OpenBSDInstallWrapup
+
+OpenBSDInstallAperture
+
+OpenBSDInstallConsole
+
+OpenBSDInstallWrapupPart2
+
 OpenBSDCongratulations
diff --git a/distrib/notes/armish/install b/distrib/notes/armish/install
index efde003b3fe..aadedb5841e 100644
--- a/distrib/notes/armish/install
+++ b/distrib/notes/armish/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.4 2008/03/10 21:38:27 miod Exp $
+dnl	$OpenBSD: install,v 1.5 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSDInstallPart2
@@ -31,7 +31,12 @@ OpenBSDInstallPart4({:- If you have Linux partitions
 	defined on the disk, these will usually show up as partition
 	'h', 'i' and so on.-:})
 
-	Explain more here.
+	Note that all OpenBSD partitions in the disk label must have an
+	offset that makes it start within the OpenBSD part of the disk,
+	and a size that keeps it inside of that portion of the disk.  This
+	is within the bounds of the 'c' partition if the disk is not being
+	shared with other operating systems, and within the OpenBSD fdisk
+	partition if the disk is being shared.
 
 OpenBSDInstallPart5(wd0)
 
@@ -49,4 +54,8 @@ OpenBSDCommonFS
 
 OpenBSDCommonURL
 
+OpenBSDInstallWrapup
+
+OpenBSDInstallWrapupPart2
+
 OpenBSDCongratulations
diff --git a/distrib/notes/hp300/install b/distrib/notes/hp300/install
index c9ddef0e82a..a7b36fddf2e 100644
--- a/distrib/notes/hp300/install
+++ b/distrib/notes/hp300/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.33 2008/03/10 21:38:27 miod Exp $
+dnl	$OpenBSD: install,v 1.34 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude({:-HP-IB disks-:})
 
 The ramdisk kernel may be loaded from the network, from CD-ROM, or other
@@ -129,4 +129,8 @@ OpenBSDCommonFS(NFS)
 
 OpenBSDCommonURL
 
+OpenBSDInstallWrapup
+
+OpenBSDInstallWrapupPart2
+
 OpenBSDCongratulations
diff --git a/distrib/notes/hppa/install b/distrib/notes/hppa/install
index 22049f6131c..3cf0a220f4d 100644
--- a/distrib/notes/hppa/install
+++ b/distrib/notes/hppa/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.15 2008/03/10 21:38:27 miod Exp $
+dnl	$OpenBSD: install,v 1.16 2008/08/05 22:58:01 miod Exp $
 dnl lots of texts coming from {mac68k,mvme68k,vax}/install initially
 OpenBSDInstallPrelude
 
@@ -157,4 +157,8 @@ OpenBSDCommonFS
 
 OpenBSDCommonURL
 
+OpenBSDInstallWrapup
+
+OpenBSDInstallWrapupPart2
+
 OpenBSDCongratulations
diff --git a/distrib/notes/i386/install b/distrib/notes/i386/install
index 81427dc1817..237f89c49b3 100644
--- a/distrib/notes/i386/install
+++ b/distrib/notes/i386/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.40 2008/03/10 21:38:27 miod Exp $
+dnl	$OpenBSD: install,v 1.41 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude
 
 If OpenBSD will be sharing the disk with DOS or another operating
@@ -98,4 +98,12 @@ OpenBSDCommonFS
 
 OpenBSDCommonURL
 
+OpenBSDInstallWrapup
+
+OpenBSDInstallAperture
+
+OpenBSDInstallConsole
+
+OpenBSDInstallWrapupPart2
+
 OpenBSDCongratulations
diff --git a/distrib/notes/landisk/install b/distrib/notes/landisk/install
index 25d6b18ca45..4584d3730e9 100644
--- a/distrib/notes/landisk/install
+++ b/distrib/notes/landisk/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.4 2008/03/10 21:38:28 miod Exp $
+dnl	$OpenBSD: install,v 1.5 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSDInstallPart2
@@ -45,4 +45,8 @@ OpenBSDCommonFS
 
 OpenBSDCommonURL
 
+OpenBSDInstallWrapup
+
+OpenBSDInstallWrapupPart2
+
 OpenBSDCongratulations
diff --git a/distrib/notes/luna88k/install b/distrib/notes/luna88k/install
index d40f4c725ec..a943ef426e9 100644
--- a/distrib/notes/luna88k/install
+++ b/distrib/notes/luna88k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.5 2008/03/10 21:38:28 miod Exp $
+dnl	$OpenBSD: install,v 1.6 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -107,4 +107,8 @@ OpenBSDCommonFS(NFS)
 		
 OpenBSDCommonURL
 
+OpenBSDInstallWrapup
+
+OpenBSDInstallWrapupPart2
+
 OpenBSDCongratulations
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index e36058031db..26a16a80e8b 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.78 2008/05/12 22:01:39 miod Exp $
+dnl	$OpenBSD: m4.common,v 1.79 2008/08/05 22:57:59 miod Exp $
 dnl
 dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -316,7 +316,7 @@ 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.
+dnl first 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
@@ -393,36 +393,47 @@ dnl OpenBSDInstallNet(other installation sources,hasfloppy)
 dnl Setting up the network
 define({:-OpenBSDInstallNet-:},
 {:-	After all your file systems have been created, the install program
-	will give you an opportunity to configure the network.  The network
-	configuration you enter (if any) can then be used to do the install
-	from another system using HTTP or FTP, and will also be the
-	configuration used by the system after the installation is complete.
+	will prompt you for the system hostname, and will give you an
+	opportunity to configure the network.  The network configuration
+	you enter (if any) can then be used to do the install from another
+	system using HTTP or FTP, and will also be the configuration used
+	by the system after the installation is complete.
+
+	Note that the system hostname should be without the domain part.
+
+If you select to configure the network, the install program will
+ask you for the name of your system and the DNS domain name to use.
+Note that the host name should be without the domain part, and that
+the domain name should NOT {:-include-:} the host name part.
 
 	If you select to configure the network, the install program will
-	ask you for the name of your system and the DNS domain name to use.
-	Note that the host name should be without the domain part, and that
-	the domain name should NOT {:-include-:} the host name part.
-
-	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
-	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
-	list of the acceptable media flags, and asked if you want to provide
-	any.  In doubt, do not enter any media flags; or you can refer to
-	the manual page for your interface for the appropriate flags.
+	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.  If the IP address should
+	be obtained from a DHCP server, simply enter ``dhcp'' when asked
+	for the IP address.  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 list of the acceptable media flags, and
+	asked if you want to provide any.  In doubt, do not enter any media
+	flags; or you can refer to the manual page for your interface for
+	the appropriate flags.
 
 	After all network interfaces have been configured, the install pro-
-	gram will ask for a default route and IP address of the primary
-	name server to use.  You will also be presented with an opportunity
-	to edit the host table.
+	gram will ask for the DNS domain name to use, as well as the IP
+	address of the primary name server to use.  Finally, you will be
+	asked for the IP address of the default route.
 
-	At this point you will be allowed to edit the file system table
-	that will be used for the remainder of the installation and that
-	will be used by the finished system, following which the new file
-	systems will be mounted to complete the installation.
+	You will also be presented with an opportunity to edit the host
+	table.
+
+	At this point you will be asked for the initial root password of
+	the system, twice.  Although the install program will only check
+	that the two passwords match, you should make sure to use a
+	strong password.  As a minimum, the password should be at least
+	six characters long and a mixture of both lower and uppercase
+	letters, numbers and punctuation characters.
 
         After these preparatory steps have been completed, you will be
         able to extract the distribution sets onto your system.  There
@@ -641,15 +652,46 @@ define({:-OpenBSDCommonURL-:},
 		you really do want to download and install the files.
 		Assuming you acquiesce, the files will begin to download
 		and unpack.  If not, you will be given the option of
-		installing sets via one of the other install methods.
-
-
+		installing sets via one of the other install methods.-:})dnl
+dnl
+dnl Description of the end of the installation procedure.
+dnl This is split in multiple parts because not all platforms will
+dnl suggest setting the aperture sysctl or configuring a serial console.
+dnl
+dnl (the first blank line is intentional)
+define({:-OpenBSDInstallWrapup-:},
+{:-
 	When all the selected distribution sets have been extracted, you
-	will be allowed to select which time zone your system will be
-	using, all the device nodes needed by the installed system will
-	be created for you, and the file systems will be unmounted.  For
-	this to work properly, it is expected that you have installed
-	at least the "base{:--:}OSrev", "etc{:--:}OSrev", and "bsd" distribution sets.-:})dnl
+	will be asked whether you want to start shhd(8) by default,
+	as well as your ntp server (ntpd(8) will not be started by
+	default if you don't provide a server).-:})dnl
+dnl
+define({:-OpenBSDInstallAperture-:},
+{:-	You will next be asked whether you intend to run the X Window
+	System on your machine.  The install program needs to know
+	this, to change a configuration setting controlling whether
+	the X server will be able to access the xf86(4) driver; it
+	is not necessary to answer `y' to this question if you only
+	intend to run X client programs on a remote display.-:})dnl
+dnl
+define({:-OpenBSDInstallConsole-:},
+{:-	By default, the OpenBSD/MACHINE installation will only start
+	terminals on the primary display device.
+
+	If you are installing using a serial console, the installer
+	program will ask you whether you want to also enable an
+	additional terminal on that line, and will allow you to select
+	the line speed.-:})dnl
+dnl
+define({:-OpenBSDInstallWrapupPart2-:},
+{:-	The last thing you'll need to configure is the time zone your
+	system will be using.  For this work properly, it is expected
+	that you have installed at least the "base{:--:}OSrev", "etc{:--:}OSrev",
+	and "bsd" distribution sets.
+
+	The installer program will the proceed to create all the device
+	nodes needed by the installed system, and will unmount the
+	file systems.-:})dnl
 dnl
 define({:-OpenBSDCongratulations-:},
 {:-Congratulations, you have successfully installed OpenBSD OSREV.  When you
diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install
index 08c57cbafe6..f6b2c891661 100644
--- a/distrib/notes/mac68k/install
+++ b/distrib/notes/mac68k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.35 2008/03/10 21:38:28 miod Exp $
+dnl	$OpenBSD: install,v 1.36 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSDInstallPart2
@@ -103,6 +103,10 @@ OpenBSDCommonFS(NFS)
 
 OpenBSDCommonURL
 
+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"
diff --git a/distrib/notes/macppc/install b/distrib/notes/macppc/install
index b9bcbb5af84..4d5bd7fc767 100644
--- a/distrib/notes/macppc/install
+++ b/distrib/notes/macppc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.25 2008/03/10 21:38:28 miod Exp $
+dnl	$OpenBSD: install,v 1.26 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude
 
 Before you begin, you should decide if OpenBSD is to be installed
@@ -150,4 +150,12 @@ OpenBSDCommonFS
 
 OpenBSDCommonURL
 
+OpenBSDInstallWrapup
+
+OpenBSDInstallAperture
+
+OpenBSDInstallConsole
+
+OpenBSDInstallWrapupPart2
+
 OpenBSDCongratulations
diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install
index 95119101613..e87b405d89e 100644
--- a/distrib/notes/mvme68k/install
+++ b/distrib/notes/mvme68k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.30 2008/03/10 21:38:28 miod Exp $
+dnl	$OpenBSD: install,v 1.31 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -272,6 +272,10 @@ OpenBSDCommonFS(NFS)
 		
 OpenBSDCommonURL
 
+OpenBSDInstallWrapup
+
+OpenBSDInstallWrapupPart2
+
 OpenBSDCongratulations
 
 
diff --git a/distrib/notes/mvme88k/install b/distrib/notes/mvme88k/install
index 9807836327e..c0d7ad36865 100644
--- a/distrib/notes/mvme88k/install
+++ b/distrib/notes/mvme88k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.23 2008/04/02 21:53:15 miod Exp $
+dnl	$OpenBSD: install,v 1.24 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -256,6 +256,10 @@ OpenBSDCommonFS(NFS)
 		
 OpenBSDCommonURL
 
+OpenBSDInstallWrapup
+
+OpenBSDInstallWrapupPart2
+
 OpenBSDCongratulations
 
 
diff --git a/distrib/notes/sgi/install b/distrib/notes/sgi/install
index ea92c23253f..e3f529d7831 100644
--- a/distrib/notes/sgi/install
+++ b/distrib/notes/sgi/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.12 2008/07/29 15:06:51 jsing Exp $
+dnl	$OpenBSD: install,v 1.13 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -83,7 +83,7 @@ OpenBSDFTPInstall
 OpenBSDHTTPInstall
 
 OpenBSDTAPEInstall
-
+dnl
 dnl OpenBSDCDROMInstall
 
 OpenBSDNFSInstall
@@ -92,4 +92,8 @@ OpenBSDCommonFS(NFS)
 
 OpenBSDCommonURL
 
+OpenBSDInstallWrapup
+
+OpenBSDInstallWrapupPart2
+
 OpenBSDCongratulations
diff --git a/distrib/notes/socppc/install b/distrib/notes/socppc/install
index 64b15a3b333..4561273aff4 100644
--- a/distrib/notes/socppc/install
+++ b/distrib/notes/socppc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.1 2008/05/13 20:47:32 kettenis Exp $
+dnl	$OpenBSD: install,v 1.2 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSDInstallPart2
@@ -31,7 +31,12 @@ OpenBSDInstallPart4({:- If you have Linux partitions
 	defined on the disk, these will usually show up as partition
 	'h', 'i' and so on.-:})
 
-	Explain more here.
+	Note that all OpenBSD partitions in the disk label must have an
+	offset that makes it start within the OpenBSD part of the disk,
+	and a size that keeps it inside of that portion of the disk.  This
+	is within the bounds of the 'c' partition if the disk is not being
+	shared with other operating systems, and within the OpenBSD fdisk
+	partition if the disk is being shared.
 
 OpenBSDInstallPart5(wd0)
 
@@ -49,4 +54,8 @@ OpenBSDCommonFS
 
 OpenBSDCommonURL
 
+OpenBSDInstallWrapup
+
+OpenBSDInstallWrapupPart2
+
 OpenBSDCongratulations
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index c3b05b7f1a4..a3140f6f976 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.66 2008/03/10 21:38:28 miod Exp $
+dnl	$OpenBSD: install,v 1.67 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude({:-SMD disks-:})
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -204,6 +204,10 @@ OpenBSDCommonFS
 		
 OpenBSDCommonURL
 
+OpenBSDInstallWrapup
+
+OpenBSDInstallWrapupPart2
+
 After completing an installation:
 
 Now try a reboot.  (If needed, swap your SCSI IDs first.)
@@ -225,18 +229,6 @@ the OpenBSD boot blocks will look for "bsd" on the boot device by default.
 
 OpenBSDCongratulations
 
-If you will be running your OpenBSD system from a serial console, you may
-need to edit /etc/ttys and change the terminal type, and getty method from
-"sun" and "suncons" to "vt100" and "std.9600" or something similar.  Also
-when running from a serial console, you may wish to adjust the eeprom
-settings for input-device, output-device, screen-#columns, and screen-#rows
-as appropriate.
-
-In order to use 'tip' on OpenBSD/MACHINE, you'll need to edit /etc/ttys
-and add "local" to the end of the tty configuration line, and run
-'ttyflags -a' to put your changes into effect.
-
-
 
 Installing from SunOS:
 
diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install
index aa54e653f26..cdc9631bafd 100644
--- a/distrib/notes/sparc64/install
+++ b/distrib/notes/sparc64/install
@@ -1,9 +1,9 @@
-dnl	$OpenBSD: install,v 1.40 2008/03/10 21:38:28 miod Exp $
+dnl	$OpenBSD: install,v 1.41 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
 in terms of preliminary setup is to use the OpenBSD installation
-CD-ROM, or an installation floppy.
+CD-ROM, or an installation floppy (if your machine can boot from floppy).
 
 If your machine is hooked up to a network, try and find a server to
 arrange for a diskless setup. This is a convenient way to install on a
@@ -67,15 +67,6 @@ partition naming a=0, b=1...
 	ok boot disk1:b bsd     # example - scsi target 1 or
 				# second ide drive
 
-During the boot, the kernel might not be able to determine by itself
-which device it has been booted from.  In this case, it will ask you
-for the root and swap devices.  Answer the device and partition you
-booted from as the root partition (likely sd0b or wd0b); you might
-want to rely on the boot messages to find the correct device name
-(see below).  When the kernel asks you for the swap device, just
-validate the suggested device name; since the installation procedure
-does not use swap, it doesn't matter.
-
 
 Installing using a diskless setup:
 
@@ -137,6 +128,12 @@ OpenBSDCommonFS
 		
 OpenBSDCommonURL
 
+OpenBSDInstallWrapup
+
+OpenBSDInstallAperture
+
+OpenBSDInstallWrapupPart2
+
 After completing an installation:
 
 Now try a reboot.  (If needed, swap your SCSI IDs first).
@@ -150,19 +147,13 @@ empty, value, type the following:
 
     ok set-default boot-file
 
+On multiprocessor systems, to boot the multiprocessor kernel automatically,
+type the following:
 
-OpenBSDCongratulations
+    ok setenv boot-file bsd.mp
 
-If you will be running your OpenBSD system from a serial console, you may
-need to edit /etc/ttys and change the terminal type, and getty method from
-"sun" and "suncons" to "vt100" and "std.9600" or something similar.  Also
-when running from a serial console, you may wish to adjust the eeprom
-settings for input-device, output-device, screen-#columns, and screen-#rows
-as appropriate.
 
-In order to use 'tip' on OpenBSD/MACHINE, you'll need to edit /etc/ttys
-and add "local" to the end of the tty configuration line, and run
-'ttyflags -a' to put your changes into effect.
+OpenBSDCongratulations
 
 
 Installing from Solaris:
diff --git a/distrib/notes/vax/install b/distrib/notes/vax/install
index 394dd7922b8..a23aaffb30d 100644
--- a/distrib/notes/vax/install
+++ b/distrib/notes/vax/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.20 2008/03/10 21:38:28 miod Exp $
+dnl	$OpenBSD: install,v 1.21 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude({:-MSCP or other non-SCSI disks-:})
 
 For most systems, the easiest way to install OpenBSD/MACHINE OSREV is via
@@ -49,7 +49,7 @@ typing "mopd -a", if you've not configured it to run by default.
 Next you need to export a directory for your new machine to mount over
 NFS. This is accomplished by adding an entry to /etc/exports such as:
 
-/export/MACHINE -maproot=root quickvax
+	/export/MACHINE -maproot=root quickvax
 
 In a typical NFS install, the directory `/export/MACHINE' will contain
 the ramdisk kernel image `bsd.rd', although it is possible to populate
@@ -80,6 +80,7 @@ OpenBSDInstallPart2
 
 	The OpenBSD bootloader will appear, and a countdown should begin;
 	type any key on the console to interrupt and type
+
 		boot bsd.rd
 
 	It will take a while to load the kernel especially on a slow
@@ -123,4 +124,8 @@ OpenBSDCommonFS(NFS)
 
 OpenBSDCommonURL
 
+OpenBSDInstallWrapup
+
+OpenBSDInstallWrapupPart2
+
 OpenBSDCongratulations
diff --git a/distrib/notes/zaurus/install b/distrib/notes/zaurus/install
index 047704dfef7..a6126eaa0d9 100644
--- a/distrib/notes/zaurus/install
+++ b/distrib/notes/zaurus/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.20 2008/03/10 21:38:28 miod Exp $
+dnl	$OpenBSD: install,v 1.21 2008/08/05 22:58:01 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSD is installed on the Zaurus by effectively converting
@@ -119,10 +119,9 @@ OpenBSDInstallPart4({:- If you have Linux partitions
 	 2: 0C 7560   0  1 - 9065   7  1 [     1028160:      204800 ] Win95 FAT32L
 	 3: A6 9065   7  2 - 67885   5  3 [     1232960:     7999488 ] OpenBSD     
 
-	After shrinking the MS-DOS partition, please be sure to newfs
-	it using:
-
-		newfs -t msdos /dev/rwd0k
+	After shrinking the MS-DOS partition, you will need to
+	reformat it from Linux or OpenBSD once OpenBSD is installed.
+	(You will be reminded of this later in this document)
 
 	Note that all OpenBSD partitions in the disk label must have an
 	offset that makes it start within the OpenBSD part of the disk,
@@ -131,6 +130,34 @@ OpenBSDInstallPart4({:- If you have Linux partitions
 	shared with other operating systems, and within the OpenBSD fdisk
 	partition if the disk is being shared.
 
+OpenBSDInstallPart5(wd0)
+
+OpenBSDInstallNet({:-CD-ROM, -:},nofloppy)
+
+OpenBSDFTPInstall
+
+OpenBSDHTTPInstall
+
+OpenBSDTAPEInstall
+
+OpenBSDCDROMInstall
+
+OpenBSDDISKInstall({:-"wdN" or -:},,{:-, Linux (ext2) or MS-DOS-:})
+
+OpenBSDCommonFS
+
+OpenBSDCommonURL
+
+OpenBSDCongratulations
+
+	If you have kept the MS-DOS partition, do not forget to
+	newfs it using:
+
+		newfs -t msdos /dev/rwd0k
+
+	This should be done before attempting to mount and use this
+	partition from Linux or OpenBSD.
+
 	For purposes of recovery in case Linux becomes inoperable for
 	one reason or another with HDD1 Errors and such, we detail the
 	process to come up single user:
@@ -194,26 +221,3 @@ OpenBSDInstallPart4({:- If you have Linux partitions
 		cp rc.rofilesys rc.rofilesys.ext3
 		cp ext2 rc.rofilesys
 
-	If you have created an 'A6' OpenBSD partition earlier using fdisk,
-	you will be able to use disklabel to cut that partition into at
-	least a root filesystem and swap partition.
-
-OpenBSDInstallPart5(wd0)
-
-OpenBSDInstallNet({:-CD-ROM, -:},nofloppy)
-
-OpenBSDFTPInstall
-
-OpenBSDHTTPInstall
-
-OpenBSDTAPEInstall
-
-OpenBSDCDROMInstall
-
-OpenBSDDISKInstall({:-"wdN" or -:},,{:-, Linux (ext2) or MS-DOS-:})
-
-OpenBSDCommonFS
-
-OpenBSDCommonURL
-
-OpenBSDCongratulations