Jumbo update of installation notes for alpha:

- mention more models supported by each floppy
- mention more supported and unsupported models
- sync cdrom boot instructions with reality
- update ftp urls, ftp.digital.com no longer exist (but I resisted whining
  at HP which does not provide all the contents formerly available from
  ftp.digital.com and which you have to pick from educational sites which
  have mirrored them)
- various little rewording

with help from sobrado@

5 files changed, 89 insertions, 87 deletions

diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index 9e69e26e49e..1f90d7092f7 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -1,12 +1,14 @@
-dnl	$OpenBSD: contents,v 1.44 2008/03/10 21:25:52 miod Exp $
+dnl	$OpenBSD: contents,v 1.45 2008/08/06 17:22:14 miod Exp $
 TopPart
 
 OpenBSDfloppy
 			This floppy image will boot on the following MACHINE
 			models:
 			- AlphaStation 200, 250, 255, 400
+			- AlphaServer 300 and 400
 			- AlphaStation 500, 600
-			- AlphaServer 800, 1000, 1000A
+			- AlphaStation 600A, 1200
+			- AlphaServer 800, 1000, 1000A, 1200, 4000 and 4100
 			- AXPpci33 based machines, including ``Noname'',
 			  UDB, Multia
 			- EB164 based machines, including PC164, 164SX,
@@ -17,8 +19,10 @@ OpenBSDfloppy
 			below.
 			This floppy image will boot on the following MACHINE
 			models:
-   			- Alpha Processor, Inc. UP1000
-			- XP900, XP1000, 264DP, DS10, DS20
+   			- Alpha Processor, Inc. UP1000, UP1100, UP2000 and
+			  UP2000+
+			- XP900, XP1000, CS20, DS10, DS20, DS20L, ES40 and
+			  264DP
 
 OpenBSDdistsets
 
diff --git a/distrib/notes/alpha/hardware b/distrib/notes/alpha/hardware
index 50bd21e094d..2f962870a43 100644
--- a/distrib/notes/alpha/hardware
+++ b/distrib/notes/alpha/hardware
@@ -1,13 +1,13 @@
-dnl	$OpenBSD: hardware,v 1.95 2008/07/23 19:28:27 miod Exp $
+dnl	$OpenBSD: hardware,v 1.96 2008/08/06 17:22:14 miod Exp $
 OpenBSD/MACHINE OSREV is expected to run on the following hardware.
-If you have hardware that is listed here and are unable to run
-OpenBSD, or if you are able to run OpenBSD on hardware not listed
-here, please send mail to <alpha@OpenBSD.org> with as much information
-as possible.
+If you have hardware that is listed here and are unable to run OpenBSD,
+or if you are able to run OpenBSD on hardware not listed here, please
+send mail to <alpha@OpenBSD.org> with as much information as possible.
 
 Supported hardware:
-    XP900, XP1000, CS20, DS10, DS20, 264DP, and other EV6 machines using the
-    Tsunami chipset (only one processor on multiprocessor models will be used)
+    XP900, XP1000, CS20, DS10, DS20, DS20L, ES40, 264DP, and other EV6
+    machines using the Tsunami chipset (only one processor on multiprocessor
+    models will be used)
 	  Supported devices:
 		Built-in serial and parallel ports.
 		Built-in DEC21143 Ethernet.
@@ -57,8 +57,9 @@ Supported hardware:
 		ISA IDE controller on the EB164.
 		ISA devices that require DMA operation.
 
-    AlphaServer 800 (also known as Digital Server 3300 and 3305), 1000, 1000A,
-    AlphaServer 1200 and 4100, and AlphaStation 1200
+    AlphaStation 600A and 1200
+    AlphaServer 800 (also known as Digital Server 3300 and 3305), 1000, 1000A
+    AlphaServer 1200, 4000 and 4100
 	  Supported devices:
 		Built-in serial and parallel ports.
 		Built-in DEC21040 Ethernet.
@@ -71,7 +72,7 @@ Supported hardware:
 		Built-in audio.
 		ISA and EISA devices that require DMA operation.
 
-    AlphaServer 400 and AlphaStation 200, 250, 255 and 400
+    AlphaServer 300 and 400, and AlphaStation 200, 250, 255 and 400
 	  Supported devices:
 		Built-in serial and parallel ports.
 		Built-in DEC21040 Ethernet.
@@ -138,14 +139,20 @@ Supported hardware:
 
     At this time none of the following systems are supported:
 	DECpc AXP150 (2000/300) ``Jensen'' systems (EISA-bus PC-like systems)
-	AlphaServer systems unlisted above, such as models 2000, 2100 and 2100A
-	Alpha XL systems
+	AlphaServer 2000, 2100 and 2100A
+	AlphaServer 4100
+	AlphaServer 8200, 8400 and GS60
+	AlphaServer DS15, DS15A, DS25, ES45 and TS202C
+	AlphaServer ES47, ES80 and GS1280
+	AlphaServer GS80, GS160 and GS320
+	Alpha XL systems (no SRM)
 	DEC 4000, 7000, and 10000 systems (FutureBus+ and XMIBus-based)
 	EB64+ based systems
-	Samsung 164BX/UX (no SRM)
+	Samsung 164BX and 164UX (no SRM)
+	VME Alpha systems (AXPvme, ALPHAvme)
+	Tadpole ALPHAbook
 	Multiprocessor Alpha systems (though they will run fine using one
 	    processor only, if the model is listed as supported above)
-	VME Alpha systems
 
 Supported Peripherals:
 
@@ -983,7 +990,6 @@ Drivers for hardware marked with "[-]" are NOT available on the installation
 floppies, or the CD-ROM installation kernel, but are available in the GENERIC
 kernel which will be installed.
 
-Console frame buffers and keyboards are only supported on systems
-explicitly mentioned above.  On other systems, including all
-TURBOchannel-based machines, OpenBSD/MACHINE *must* be used with a
-serial console.
+Console frame buffers and keyboards are only supported on systems explicitly
+mentioned above.  On other systems, including all TURBOchannel-based machines,
+OpenBSD/MACHINE *must* be used with a serial console.
diff --git a/distrib/notes/alpha/install b/distrib/notes/alpha/install
index ac7fbc1e496..d0b41a2b1ff 100644
--- a/distrib/notes/alpha/install
+++ b/distrib/notes/alpha/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.31 2008/08/05 22:58:01 miod Exp $
+dnl	$OpenBSD: install,v 1.32 2008/08/06 17:22:14 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk.  The easiest way is
@@ -32,17 +32,10 @@ Booting from CD-ROM installation media:
 	as DKA600, you want to use dka6 (device IDs are case
 	insensitive).
 
-	On all MACHINE computers but the TURBOchannel DEC 3000 series,
-	insert the OpenBSD/MACHINE CD-ROM and enter
-		boot -fi OSREV/MACHINE/bsd.rd DEVICE
+	Insert the OpenBSD/MACHINE CD-ROM and enter
+		boot DEVICE
 	where DEVICE is the dka device name.
 
-	On the DEC 3000 series, insert the OpenBSD/MACHINE CD-ROM and enter
-		boot -fi ALPHA DEVICE
-	where DEVICE is the dka device name.
-	
-	Note that, in both cases, the argument order is important.
-
 	You should see info about the primary and secondary boot
 	and then the kernel should start to load.  If the kernel
 	fails to load or the spinning cursor has stopped and nothing
diff --git a/distrib/notes/alpha/prep b/distrib/notes/alpha/prep
index af648ef52af..15caedc9f8e 100644
--- a/distrib/notes/alpha/prep
+++ b/distrib/notes/alpha/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.26 2008/08/05 23:02:34 miod Exp $
+dnl	$OpenBSD: prep,v 1.27 2008/08/06 17:22:14 miod Exp $
 OpenBSD/MACHINE requires the SRM console.  Some alphas come with
 the AlphaBIOS (also known as the ARC firmware on older machines) instead;
 this is what Windows NT uses. It is fairly simple to replace the AlphaBIOS
@@ -6,9 +6,9 @@ with the SRM firmware.
 
 Switching your MACHINE to SRM console:
 
-    AlphaServer class machines (except for model 400) and recent machines
-    (such as the Miata and later models) have enough flash ROM space to
-    carry both the AlphaBIOS and the SRM console.
+    AlphaServer class machines (except for models 300 and 400) and recent
+    enough machines (such as the Miata and later models) have enough
+    flash ROM space to carry both the AlphaBIOS and the SRM console.
 
     To switch to SRM from AlphaBIOS, do the following:
     - enter the AlphaBIOS setup upon startup
@@ -23,11 +23,16 @@ Switching your MACHINE to SRM console:
     164LX), your system can not hold both the AlphaBIOS and SRM console in
     flash, and you will have to upgrade your firmware.
 
-    You can get replacement firmware either from a firmware update CD-ROM
-    or via FTP from
-	ftp://ftp.digital.com/pub/DEC/Alpha/firmware/
+    You can get replacement firmware either from a firmware update CD-ROM,
+    which can be downloaded from
+	ftp://ftp.hp.com/pub/alphaserver/firmware/v73.zip
+    However, this CD-ROM image only supports AlphaServer DS10, DS20, DS20L,
+    and ES40.  Firmware update for other models can be picked individually
+    via FTP from
+	ftp://ftp.hp.com/pub/alphaserver/firmware/retired_platforms/
+
     Please refer to
-	http://ftp.digital.com/pub/DEC/Alpha/firmware/readme.html
+	http://h18002.www1.hp.com/alphaserver/firmware/index.html
     for more information.
 
     Note that, on most models, upgrading the firmware requires a jumper
@@ -36,13 +41,17 @@ Switching your MACHINE to SRM console:
 
 AXPpci33 Motherboard specific notes:
 
-    The 1994 version of the OEM guide has an incorrect pinout
-    for the serial ports.  The newer version from
-    ftp://ftp.digital.com/pub/Digital/axppci/design_guide.ps.Z 
-    has a corrected pinout (as well as more information than
-    the 1994 edition).  Note that there are two flavors
-    of PC serial connectors.  If you have the wrong kind,
-    you won't get any output from the serial console.
+    The 1994 version of the OEM guide has an incorrect pinout for the
+    serial ports.  The newer version used to be available at
+	ftp://ftp.digital.com/pub/Digital/axppci/design_guide.ps.Z 
+    with a corrected pinout (as well as more information than the 1994
+    edition). Although ftp.digital.com does not exist anymore, a few
+    copies of this document are scattered accross various ftp servers
+    on the globe, such as
+	ftp://ftp.uniroma2.it/Digital/support/axppci/design_guide.ps.Z
+    
+    Note that there are two flavors of PC serial connectors.  If you
+    have the wrong kind, you won't get any output from the serial console.
 
 Using the SRM console:
 
@@ -128,46 +137,36 @@ SRM console boot device restrictions:
 
 OpenBSD/MACHINE console device restrictions:
 
-    On systems with no framebuffer supported, including all
-    TURBOchannel-based machines, OpenBSD/MACHINE must be used with a
-    serial console.  Setting an Alpha system to use a serial console
-    is system-specific.  The procedure for most common hardware is:
-
-	DEC 3000/[4-9]00's:
-		Flip the appropriate switch on the back of the machine.
-
-		It is also necessary to set the ``server'' SRM
-		environment variable to ``on'' for the system to
-		autoboot on powerup despite the lack of a keyboard
-		and mouse plugged in.
-
-	DEC 3000/300 family machines:
-		Boot the machine with the keyboard/mouse connector
+    On systems with no framebuffer supported (currently all
+    TURBOchannel-based machines), OpenBSD/MACHINE must be used with a
+    serial console.
+    
+    Setting an Alpha system to use a serial console is system-specific.
+    Although most models will default to serial console if no keyboard
+    is connected on powerup, this behaviour can't be relied upon.
+    The recommended procedure is:
+
+	DEC 3000/[4-9]00
+		Flip the `S3' switch on the back of the machine
+		(up for glass console, down for serial console).
+
+		When configured to use a serial console, it is also
+		necessary to set the ``server'' SRM environment
+		variable to ``on'' for the system to autoboot on
+		powerup despite the lack of a keyboard and mouse
+		plugged in.
+
+	DEC 3000/300 family machines
+		These machines will automatically switch to serial
+		console if the keyboard/mouse connector is left
 		unplugged.
 
-	Other machines running the SRM console on local display:
-		From the SRM console, enter
+	All other machines
+		From the SRM console, enter either
 			set console serial
+		or
+			set console graphics
 		at the SRM prompt, then enter
 			init
-		or cycle power.  Switching back to glass console is
-		done with the opposite command:
-			set console graphics
+		or cycle power.
 
-    See your owner's manual for more details on how to set your machine
-    to use a serial console.
-
-    Note that some MACHINE computers currently *require* a serial console
-    and can't be used from a regular keyboard/display console, even though
-    the motherboard has appropriate connectors.
-    Currently, only the TURBOchannel MACHINE computers (DEC 3000) require
-    use of a serial console.
-
-dnl XXX This only affects kernels built without pckbc on machines configured
-dnl XXX for glass console. Not worth keeping at the moment... -- miod
-dnl    If booting using the regular console aborts with ``not configured to
-dnl    use display && keyboard console'', then you need to use a serial
-dnl    console.
-dnl
-    If your machine was not listed in the list above, please report this
-    to <alpha@OpenBSD.org>.
diff --git a/distrib/notes/alpha/whatis b/distrib/notes/alpha/whatis
index 466788dede1..30016e49432 100644
--- a/distrib/notes/alpha/whatis
+++ b/distrib/notes/alpha/whatis
@@ -1,5 +1,5 @@
-dnl	$OpenBSD: whatis,v 1.12 2005/03/18 13:29:45 miod Exp $
+dnl	$OpenBSD: whatis,v 1.13 2008/08/06 17:22:14 miod Exp $
 
 OpenBSD/MACHINE runs on a broad range of Alpha processor-based machines,
-including workstations manufactured by Digital (now HP), as well as OEM
-motherboards designed by Alpha Processor, Inc.
+including workstations manufactured by Digital (then Compaq, now HP), as
+well as OEM motherboards designed by Samsung and Alpha Processor, Inc.