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...

3 files changed, 48 insertions, 24 deletions

diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index a5537afe838..17f44bef7ad 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.47 2009/02/28 20:52:58 miod Exp $
+dnl	$OpenBSD: contents,v 1.48 2009/05/12 21:06:50 miod Exp $
 TopPart
 
 OpenBSDfloppy
@@ -40,9 +40,9 @@ dnl boot, bootxx, netboot
 dnl
 DistributionDescription(eleven)
 
-OpenBSDbase(58301621,180831693,shared)
+OpenBSDbase(58301621,180831693)
 
-OpenBSDcomp(106753958,373031727,shared)
+OpenBSDcomp(106753958,373031727)
 
 OpenBSDetc(511812,1523950)
 
diff --git a/distrib/notes/alpha/features b/distrib/notes/alpha/features
new file mode 100644
index 00000000000..029ead7e348
--- /dev/null
+++ b/distrib/notes/alpha/features
@@ -0,0 +1,40 @@
+dnl	$OpenBSD: features,v 1.1 2009/05/12 21:06:50 miod Exp $
+dnl
+dnl This file lists almost all the conditional features of this port,
+dnl which are used to provide accurate installation notes.
+dnl
+dnl Information about the installer script features should be in sync with
+dnl	src/distrib/alpha/common/install.md
+dnl and the list files in
+dnl	src/distrib/alpha/{bsd.rd,common}/list
+dnl
+dnl ====
+dnl
+dnl architecture name (for the packages directory)
+define({:-MACHINE_ARCH-:},MACHINE)dnl
+dnl
+dnl define if /sbin/kbd exists on the media
+define({:-MDKBD-:},)dnl
+dnl
+dnl define if serial consoles needs to be enabled in /etc/ttys
+dnl (i.e. md_consoleinfo is not empty)
+define({:-MDSERCONS-:},1)dnl
+dnl
+dnl define if SMP kernels are provided
+define({:-MDSMP-:},)dnl
+dnl
+dnl define if shared libraries are provided
+define({:-MDSO-:},1)dnl
+dnl
+dnl define if some media have timezone information (TZ in their list)
+define({:-MDTZ-:},1)dnl
+dnl
+dnl define if glass console is possible
+dnl (XXX does not imply availablity of X servers though)
+define({:-MDX-:},1)dnl
+dnl
+dnl define if the X server can't start until machdep.allow_aperture is set
+define({:-MDXAPERTURE-:},1)dnl
+dnl
+dnl define if the X server can start without a configuration file
+define({:-MDXDM-:},)dnl
diff --git a/distrib/notes/alpha/install b/distrib/notes/alpha/install
index d0b41a2b1ff..3f40f86a40c 100644
--- a/distrib/notes/alpha/install
+++ b/distrib/notes/alpha/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.32 2008/08/06 17:22:14 miod Exp $
+dnl	$OpenBSD: install,v 1.33 2009/05/12 21:06:50 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk.  The easiest way is
@@ -105,42 +105,26 @@ OpenBSDInstallPart2
 	media is bad, your diskless setup is incorrect, or you may have
 	a hardware or configuration problem.
 
-OpenBSDBootMsgs
-
-	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
 
-OpenBSDInstallPart5(sd0)
+OpenBSDInstallPart5
 
-OpenBSDInstallNet({:-CD-ROM, -:},nofloppy)
+OpenBSDInstallPart6({:-CD-ROM, -:})
 
 OpenBSDFTPInstall
 
 OpenBSDHTTPInstall
 
-OpenBSDTAPEInstall
-
 OpenBSDCDROMInstall
 
 OpenBSDDISKInstall({:-"wdN" or -:},{:-only -:})
 
-OpenBSDCommonFS
+OpenBSDCommonInstall
 
-OpenBSDCommonURL
+OpenBSDTAPEInstall
 
 OpenBSDInstallWrapup
 
-OpenBSDInstallAperture
-
-OpenBSDInstallConsole
-
-OpenBSDInstallWrapupPart2
-
 OpenBSDCongratulations