Sync with reality

4 files changed, 15 insertions, 19 deletions

diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index 6d556f53908..f9485c5fcde 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -1,12 +1,11 @@
-dnl	$OpenBSD: contents,v 1.38 2004/09/10 19:41:35 miod Exp $
+dnl	$OpenBSD: contents,v 1.39 2005/03/18 13:31:13 miod Exp $
 TopPart
 
 OpenBSDfloppy
 			This floppy image will boot on the following MACHINE
 			models:
 			- AlphaStation 200, 250, 255, 400
-dnl uncomment when it works again
-dnl			- AlphaStation 500, 600
+			- AlphaStation 500, 600
 			- AlphaServer 800, 1000, 1000A
 			- AXPpci33 based machines, including ``Noname'',
 			  UDB, Multia
diff --git a/distrib/notes/alpha/hardware b/distrib/notes/alpha/hardware
index 5cb3024c518..0fd264fc580 100644
--- a/distrib/notes/alpha/hardware
+++ b/distrib/notes/alpha/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.55 2005/03/18 03:44:41 jsg Exp $
+dnl	$OpenBSD: hardware,v 1.56 2005/03/18 13:31:13 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
@@ -139,16 +139,14 @@ Supported hardware:
 		TURBOchannel DEFTA FDDI cards (PMAF-FA).
 	  Unsupported devices:
 		Built-in ISDN/audio chip.
-		Built-in framebuffer.
+		Built-in framebuffer (when applicable).
 		Other TURBOchannel cards.
 
     At this time none of the following systems are supported:
 	API UP2000, UP2000+ (mostly because we don't have any to test on)
 	DECpc AXP150 (2000/300) systems (EISA-bus PC-like systems)
-dnl update when AS400/500 support is back
-dnl	AlphaServer systems, other than models 400 and 500, which seem to
-dnl	  be disguised AlphaStation machines
-	AlphaServer systems, other than model 400, which seem to
+	AlphaServer systems, other than models 400 and 500, which seem to
+	  be disguised AlphaStation machines
 	  be disguised AlphaStation machines
 	Alpha XL systems
 	DEC 4000, 7000, and 10000 systems (FutureBus+ and XMIBus based)
@@ -162,9 +160,7 @@ Supported Peripherals:
 	PCI IDE Controllers (pciide)
 		Acer Labs M5229
 		CMD Tech PCI0640, PCI0643, PCI0646, PCI0648, and PCI0649
-B
 		Contaq Microsystems/Cypress CY82C693
-A
 		Any other PCI IDE-compliant controller should work, but are
 		  untested at this point
 	SCSI Host Adapters
diff --git a/distrib/notes/alpha/install b/distrib/notes/alpha/install
index 858c9f0e0f5..1c27b4c6bd5 100644
--- a/distrib/notes/alpha/install
+++ b/distrib/notes/alpha/install
@@ -1,9 +1,7 @@
-dnl	$OpenBSD: install,v 1.24 2004/03/17 09:25:09 jmc Exp $
+dnl	$OpenBSD: install,v 1.25 2005/03/18 13:31:13 miod Exp $
 OpenBSDInstallPrelude
 
-dnl XXX document mopbooting from the SRM console.
-dnl XXX check if recent SRM console still can netboot, and if so, if they
-dnl XXX still use mop or a more recent protocol.
+dnl XXX document mopbooting, and bootp netbooting from the SRM console.
 There are several ways to install OpenBSD onto a disk.  The easiest way is
 to boot from the bootable CD-ROM mini image, then install from your favorite
 source. You can also use one of the OpenBSD installation floppies, if your
diff --git a/distrib/notes/alpha/prep b/distrib/notes/alpha/prep
index 086a9f22449..0cabd7a819c 100644
--- a/distrib/notes/alpha/prep
+++ b/distrib/notes/alpha/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.22 2004/03/23 21:05:06 jmc Exp $
+dnl	$OpenBSD: prep,v 1.23 2005/03/18 13:31:13 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
@@ -124,8 +124,11 @@ OpenBSD/MACHINE console device restrictions:
     Currently, only the TURBOchannel MACHINE computers (DEC 3000) require
     use of a serial console.
 
-    If booting using the regular console aborts with ``not configured to
-    use display && keyboard console'', then you need to use 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>.