General cleanup and updates here too, ok deraadt@

10 files changed, 428 insertions, 192 deletions

diff --git a/distrib/notes/alpha/hardware b/distrib/notes/alpha/hardware
index 5d6fdf7a24b..3d72376bd70 100644
--- a/distrib/notes/alpha/hardware
+++ b/distrib/notes/alpha/hardware
@@ -1,90 +1,336 @@
 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 <tech@openbsd.org> with as much information
+here, please send mail to <alpha@openbsd.org> with as much information
 as possible.
 
 Supported hardware:
+    XP1000, DS10, 264DP, and other single processor EV6 machines using
+    the Tsunami chipset
+          Supported devices:
+               Built-in serial and parallel ports.
+               Built-in DEC21143 ethernet.
+               Built-in ISP SCSI.
+               Built-in IDE controller.
+               Built-in USB should work, but has not been thoroughly
+                 tested.
+               Most PCI devices (see below).
+               Some ISA devices (see below).
+          Unsupported devices:
+               Floppy drive.
+               ISA devices that require DMA operation.
+    API UP1000 machines and other EV6 machines using the Irongate chipset
+          Supported devices:
+               Built-in serial and parallel ports.
+               Built-in DEC21040 ethernet.
+               Built-in IDE controller works, though there may be
+                 stability issues.
+          Unsupported devices:
+               Floppy drive.
+               ISA devices that require DMA operation.
+    Digital Personal Workstation (Miata)
+          Supported devices:
+               Built-in serial and parallel ports.
+               Built-in DEC21043 ethernet.
+               Built-in ISP SCSI, when present (i.e. on ``au'' models).
+               Built-in IDE controller.
+               Most PCI devices (see below).
+               Some ISA devices (see below).
+          Unsupported devices:
+               Floppy drive.
+               Built-in audio.
+               ISA devices that require DMA operation.
+    EB164 based machines (including PC164, 164SX, 164LX, but NOT the
+       164UX)
+          Supported devices:
+               Built-in serial and parallel ports.
+               Built-in PCIIDE controller, when present.
+               PCI graphics card (TGA or VGA compatible).
+               Most PCI devices (see below).
+               Some ISA devices (see below).
+          Unsupported devices:
+               Floppy drive.
+               ISA IDE controller on the EB164.
+               ISA devices that require DMA operation.
+    Alphastation 500 and 600
+       These systems should work, but we need to hear from people about
+       them.
+          Supported devices:
+               Built-in serial and parallel ports.
+               Built-in DEC21040 ethernet.
+               Built-in ISP SCSI.
+               Built-in IDE controller.
+               PCI graphics card (TGA or VGA compatible).
+               Most PCI devices (see below).
+               Some ISA and EISA devices (see below).
+          Unsupported devices:
+               Floppy drive.
+               Built-in audio.
+               ISA devices that require DMA operation.
+    AXPpci based machines (including ``Noname'', UDB, Multia)
+       These systems should work, but we need to hear from people about  
+       them.
+          Supported devices:
+               Built-in serial and parallel ports.
+               Built-in DEC21040 ethernet.
+               Built-in 53C810 SCSI (using the old ncr driver).
+               Built-in IDE controller. (though, will not boot from
+                 ide)
+               PCI graphics card (TGA or VGA compatible).
+               Most PCI devices (see below).
+               Some ISA devices (see below).
+          Unsupported devices:
+               Floppy drive.
+               ISA devices that require DMA operation.
+    DEC 3000 models 300{,L,X,LX}
+       These systems should work, but we need to hear from people about
+       them.
+          Supported devices:
+               Built-in serial ports.
+               Built-in LANCE ethernet.
+               Built-in SCSI (53C94).
+               TurboChannel LANCE ethernet cards (PMAD-A). (untested)
+          Unsupported devices:
+               Built-in ISDN/audio chip.
+               Built-in framebuffer.
+               Other TurboChannel cards.
+    DEC 3000 models 400,500,500X,600,700,800,900 
+       These systems should work, but we need to hear from people about
+       them.
+          Supported devices:
+               Built-in serial ports.
+               Built-in LANCE ethernet.
+               Built-in SCSI (53C94 or 53CF94-2), although both scsi
+                 controlers may not work at the same time.
+               TurboChannel LANCE ethernet cards (PMAD-A). (untested)
+          Unsupported devices:
+               Built-in ISDN/audio chip.
+               Built-in framebuffer.
+               Other TurboChannel cards.
+    At this time none of the following systems are supported:
+          DS20, API UP2000, UP2000+ (mostly because we don't have any
+            to test on.)
+          DECpc AXP150 (2000/300) systems (EISA-bus PC-like systems)
+          AlphaServer systems, other than models 400 and 500, which
+            seem to be disguised AlphaStation machines.
+          Alpha XL systems.
+          DEC 4000, 7000, and 10000 systems (FutureBus+ and XMIBus
+            based).
+          EB64+ based systems.
+          Samsung 164BX/UX. (No SRM)
+          Multiprocessor alpha systems.
+          VME Alpha systems.
+               
+    Supported Peripherals:
+               
+    SCSI Host Adapters
+          Adaptec AIC-7770-based SCSI host adapters (including the
+            Adaptec AHA-274x and AHA-284x families). (ahc)
+          Adaptec AHA-[23]94x[W] cards. (ahc)
+          Adaptec AHA-[23]9[34]xU[2W] cards . (ahc)
+          Adaptec AIC-789[29] chips and products like the AHA-29160
+            based upon it which do 160MB/sec SCSI. (ahc)
+          QLogic PCI SCSI controllers (isp)
+          Symbios Logic (NCR) 53C8xx-based PCI SCSI host adapters
+            (Including generic/no name cards, old ASUS cards, the
+            DTC-3130 series, Diamond Fireport series, etc.) (ncr)
+    PCI IDE Controllers (pciide)
+          Acer Labs M5229
+          CMD Tech PCI0640, PCI0643, PCI0646, PCI0648, and PCI0649
+          Contaq Microsystems/Cypress CY82C693
+       Any other PCI IDE-compliant controller should work, but are   
+       untested at this point
+    Ethernet Adapters
+          3Com 3c9xx EtherLink XL adapters (xl), including:
+               3Com 3c900/3c900B PCI adapters
+               3Com 3c905/3c905B/3c905C PCI adapters
+               3Com 3c980/3c980C server adapters
+               3Com 3cSOHO adapter
+               3Com 3c900B-FL and 3c900B-FL/FX fiber optic adapters
+          Intel i8255x-based (except the i82556) PCI adapters (fxp), 
+            including:
+               Intel EtherExpress PRO/10+
+               Intel EtherExpress PRO/100, PRO/100B, and PRO/100+
+               Intel EtherExpress PRO/100+ "Management Adapter"
+               Intel EtherExpress PRO/100 Dual Port
+          Digital DC21x4x-based PCI adapters (de), including:
+               Older SMC PCI EtherPower 10, 10/100 (models 8432, 9332,
+                 and 9334)
+               Older LinkSys 10, 10/100 (newer models are supported by
+                 other drivers)
+               Znyx ZX3xx
+               Cogent EM100FX and EM440TX
+               Digital PCI DE435, EISA DE425, DE450, DE500
+               Asante
+               Almost all other variants work.
+    FDDI Adapters
+          Digital DEFPA PCI FDDI adapters (fpa)
+    Sound Devices
+          Ensoniq AudioPCI (eap)
+          SoundBlaster PCI128 (eap)
+               
+    Untested Peripherals:
+               
+   The following peripherals are compiled into the system, but are not
+   known to work. It's out best guess that they do, but any feedback is
+   appreciated.
+    SCSI Host Adapters
+          AdvanSys ABP940UW, ASB3940UW-00, ASB3940U2W-00 and
+            ASB3950U160 PCI SCSI controlers. (adw)
+    RAID and Cache Controllers
+          DPT SmartCache and SmartRaid III/IV PCI/EISA adapters (dpt)
+          ICP-Vortex GDT 6xxxR[DNPS] series (gdt)
+    Serial Ports
+          Cyclades PCI Cyclom-{4, 8, 16}Y serial boards (cy)
+    Communications Controllers
+          Universal Serial Bus host controllers, including:
+               USB Universal Host Controller (uhci)
+               USB Open Host Controller (ohci)
+    Ethernet Adapters
+          3Com 3c503 (ec)
+          3Com 3c509, 3c579, and 3c59x (ep)
+          Adaptec "Starfire" AIC-6915 based PCI adapters (sf),
+            including:
+               Adaptec Single32 ANA-69011
+               Adaptec Single64 ANA-62011 and ANA-62020
+               Adaptec Duo64 ANA-62022
+               Adaptec Quartet64 ANA-62044 
+          ADMtek AL981 ("Comet") and AN983 ("Centaur-P") based PCI
+            adapters (dc), including:
+               Accton EN2242 MiniPCI
+               Linksys LNE100TX v4.x
+               Mototech ME316
+          ADMtek AN986-based USB adapters (aue), including:
+               Billionton Systems USB100
+               Corega FEther USB-TX
+               D-Link DSB-650TX
+               LinkSys USB100TX
+               Melco Inc. LU-ATX
+               SMC 2202USB
+               Kingston KNU101TX
+          AMD LANCE and PCnet-based PCI adapters (le), including:
+               BOCALANcard/PCI
+               AT&T StarLAN 10, EN100, and StarLAN Fiber
+          ASIX 88140A/88141-based PCI adapters (dc), including:
+               CNet Pro110B
+               Alfa Inc. GFC2204
+          CATC USB-EL1210A-based USB adapters (cue), including:  
+               CATC Netmate and Netmate II
+               Belkin F5U011/F5U111
+          Davicom DM9100, DM9102, and DM9102A based PCI adapters (dc),
+            including:
+               Jaton XpressNet
+          Digital DC2114x-based four port cards, (de) including:
+               Adaptec ANA-6944A
+               Cogent EM400
+               Compex 400TX
+               Znyx ZX346
+          Kawasaki LSI KL5KUSB101B-based USB adapters (kue), including:
+               3Com 3C19250
+               3Com 3c460 HomeConnect
+               ADS Technologies USB-10BT
+               Aox USB101
+               ATen UC10T
+               Corega USB-T
+               D-Link DSB-650
+               Entegra NET-USB-E45
+               Kawasaki USB101
+               LinkSys USB10T
+               Netgear EA101
+               Peracom USB
+               SMC 2102/2104USB
+               I/O Data USB-ET/T
+          Lite-On PNIC/PNIC-II-based adapters (dc), including:
+               Kingston KNE110TX
+               LinkSys LNE100TX
+               Matrox Networks FastNIC 10/100
+               Netgear FA310TX
+          Macronix 98713/98715/98725-based adapters (dc), including:
+               Accton EN1217   
+               Addtron AEF-320TX/AEF-330TX
+               NDC Communications SOHOware SFA110A 
+               SVEC PN102-TX Fast Ethernet card
+          National Semiconductor DP83815-based PCI adapters (sis),
+            including:
+               NetGear FA311
+               NetGear FA312
+          Novell NE1000, NE2000 (ISA, and PCI variants thereof) (ne)
+          RealTek 8129/8139-based adapters (rl), including:
+               Accton MPX 5030/5038
+               Allied Telesyn AT2550  
+               D-Link DFE530TX+
+               D-Link DFE538TX
+               Encore ENL832-TX 10/100 M PCI
+               Genius GF100TXR
+               KTX-9130TX 10/100 Fast Ethernet
+               Longshine LCS-8038TX-R
+               NDC NE100TX-E
+               Netronix EA-1210 Net Ether 10/100
+               Nortel BayStack 21  
+               OvisLink LEF-8129TX, LEF-8139TX
+               SMC EZ Card 10/100 PCI 1211-TX
+          SiS 900 and SiS 7016-based PCI adapters (sis), including:
+               Mototech ME313
+               NetSurf NS-KFE30D
+          SMC/WD 8003, 8013, and the SMC "Elite16" ISA boards (we)
+          Sundance ST201-based PCI adapters (ste), including:
+               D-Link DFE-550TX
+          Texas Instruments ThunderLAN PCI adapters (tl), including:
+               Compaq Netelligent PCI Adapters
+               Compaq NetFlex 3/P
+               Compaq Deskpro integrated adapter
+               Compaq Prosignia integrated adapter
+               Olicom OC2135, OC2183, OC2325, OC2326
+               Racore 8165 and 8148
+               TI ThunderLAN adapters
+          Winbond W89C840F-based adapters (wb), including:
+               Trendware TE100-PCIE
+               Compex RL100-ATX 10/100
+       Please be aware that many NE2000 adapters fail or perform very
+       poorly. We do not recommend using them, but your mileage may vary.
+    Gigabit Ethernet Adapters
+          Alteon Tigon I/II-based adapters (ti), including:
+               3Com 3c985 and 3c985B
+               Alteon ACEnic V (fiber and copper)
+               Digital EtherWORKS 1000SX
+               Farallon PN9000SX
+               Netgear GA620 and GA620T
+               SGI Tigon   
+          Intel i82452-based adapters (wx), including:
+               Intel Pro/1000 Gigabit Server Adapter
+          SysKonnect SK-984x (9841/9842/9843/9844) based adapters (sk)
+    ATM Adapters
+          Efficient Networks EN-155 and Adaptec ANA-590x ATM interfaces
+            (en)
+    FDDI Adapters
+          Digital DEFEA EISA FDDI adapters (fea)
+    WAN Adapters
+          Lan Media Corporation SSI (T1)/HSSI/DS1/DS3 WAN interfaces
+            (lmc)
+    Universal Serial Bus (USB) Devices
+          USB Audio (uaudio)  
+          USB Diamond MultiMedia Rio MP3 players (urio)
+          USB Ethernet adapters (aue, cue, kue), see above
+          USB Generic Human Interface Devices (catch-all) (uhid)
+          USB Handspring Visor (uvisor)
+          USB Hubs (uhub)
+          USB Keyboards (ukbd)
+          USB Mass Storage devices, i.e., USB floppy drives and USB
+            memory stick controllers (umass)
+          USB Mice (umouse) 
+          USB Modems (umodem)
+          USB Printers (ulpt)
+          USB Scanners (uscanner, usscanner)
+          USB-USB cables (upl)
+    Sound Devices
+          C-Media CMI8[37]38 (cmpci)
+          ESS Solo-1 PCI AudioDrive (eso)   
+          Forte Media FM801 audio (fms)
+          VIA VT82C686A SouthBridge integrated AC'97 audio (auvia)
+          S3 SonicVibes (sv)
 
-	DEC 3000/[3456789]00 series with the following peripherals:
-
-		Supported hardware:
-			Built-in serial ports.
-			Built-in LANCE ethernet.
-			Built-in SCSI chips (53c[f]94), though both
-			    may not work at the same time.
-
-		Things that may work but haven't been tested:
-			TurboChannel option slot LANCE (PMAD-A).
-
-		Things are *not* supported at this time:
-			Frame buffers of any type.
-			Other TurboChannel option boards.
-			The ISDN/Audio chip.
-
-	AlphaStation {200,250,255,400,500} and AXPpci systems
-	    (including the Multia) using the following peripherals:
-
-		Supported hardware:
-			NCR 53c810 SCSI (built-in or PCI board).
-			Built-in ns16550 serial ports.
-			DC21040-based ethernet (built-in or PCI board).
-			DC21140-based PCI ethernet boards.
-			DC21050-based PCI-PCI bridges (though other
-			    types of PCI-PCI bridges should work).
-			PCI VGA video boards.
-			DEC ZLXp-E1 (DC21030-based, "TGA") video boards.
-			PCI and ISA NE2000-compatible ethernet cards.
-			SMC/WD 8003, 8013, and the SMC "Elite16" ISA boards.
-			Integrated AXPpci33 and other ISA IDE controllers,
-			    and associated disks.
-				[Note: With single ATAPI device IDE busses, the
-				ATAPI device should be set to SLAVE.]
-			3COM 3c9xx (3c900, 3c905b, 3c905c) ethernet boards.
-			Lite-On PNIC (82c168,82c169) based ethernet boards.
-			Keyboard.
-			PS/2-style mice.
-
-		Things that may work but haven't been tested:
-			Built-in parallel ports.
-			ISA ns16x50-family serial port boards.
-			ISA ns16x50 multi-port serial boards.
-			Other NCR 53c8xx SCSI boards.
-			ST506/MFM/ESDI ISA controllers.
-
-		Things that are *not* supported at this time:
-			ISA VGA boards.
-			Sound hardware (including Windows Sound System
-			    built-in on some machines).
-			DEC ZLXp-E2 and ZLXp-E3 PCI video boards.
-			The built-in scsi controller on the AlphaStation 600.
-			PCI boards not listed above.
-			The floppy drive.
-			IDE controllers (including the built-in IDE
-			    controller on some machines).
-
-At this time none of the following systems are supported:
-	DECpc AXP 150 systems (EISA-bus PC-like systems)
-	Alpha "server" systems (other than perhaps the AlphaServer
-	    400, which might be an AlphaStation 400 in disguise).
-	Multiprocessor Alpha systems
 
 Console frame buffers and keyboards are only supported on systems
 explicately mentioned above.  On other systems, including all
 TurboChannel-based machines, OpenBSD/Alpha *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.
-
-	DEC 3000/300 family machines:
-		Boot the machine with the keyboard/mouse connector
-		unplugged.
-
-	AlphaStations, AXPpci systems and most others:
-		Get to the SRM console prompt.  Enter "set console serial",
-		then enter "init" or cycle power.
-
-See your owner's manual for more details on how to set your machine
-to use a serial console.
+serial console.
diff --git a/distrib/notes/alpha/prep b/distrib/notes/alpha/prep
index 425e92c9418..2e171c0675d 100644
--- a/distrib/notes/alpha/prep
+++ b/distrib/notes/alpha/prep
@@ -64,6 +64,27 @@ Using the SRM console:
     To see a list of all variables on your machine use the "show"
     command with no arguments.
 
+
+On systems with no framebuffer supported, including all
+TurboChannel-based machines, OpenBSD/Alpha *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.
+
+	DEC 3000/300 family machines:
+		Boot the machine with the keyboard/mouse connector
+		unplugged.
+
+	AlphaStations, AXPpci systems and most others:
+		Get to the SRM console prompt.  Enter "set console serial",
+		then enter "init" or cycle power.
+
+See your owner's manual for more details on how to set your machine
+to use a serial console.
+
+
 Alpha-related URL's:
     ftp://ftp.digital.com/pub/Digital/Alpha/
 	Alpha related documents, software and firmware upgrades.
@@ -74,7 +95,7 @@ Alpha-related URL's:
     http://www.brouhaha.com/~eric/computers/udb-man.ps.gz
 	The Multia Service manual, in postscript form.
 
-    http://www.azstarnet.com/~axplinux/
+    http://www.alphalinux.org
 	Alpha linux notes with a good introduction to Alpha chips/systems.
 
     http://www.redhat.com/support/mailing-lists/
diff --git a/distrib/notes/alpha/upgrade b/distrib/notes/alpha/upgrade
index 441b3309262..03ae1feeadd 100644
--- a/distrib/notes/alpha/upgrade
+++ b/distrib/notes/alpha/upgrade
@@ -1 +1,4 @@
-[Upgrades may not be well supported currently for the alpha port]
+Be warned that upgrades may not be well supported currently for the
+MACHINE port.
+
+OpenBSDUpgrade({:- or the installation floppy-:})
diff --git a/distrib/notes/alpha/whatis b/distrib/notes/alpha/whatis
index 72e4e0ff7fa..b92fbaacf86 100644
--- a/distrib/notes/alpha/whatis
+++ b/distrib/notes/alpha/whatis
@@ -1,73 +1,6 @@
-The worlds briefest but still comprehensive introduction to the Alpha:
+OpenBSD/alpha OSREV is a port to Alpha processor-based machines,
+such as some workstations manufactured by Digital (now Compaq), as well
+as OEM motherboards designed by Alpha Processor, Inc.
 
-The Alpha (aka AXP) processor family was DEC's path in moving away from the
-VAX and PMAX (MIPS RISC) architectures to a new RISC family that could run
-VMS without major architectural changes and also support Ultrix/OSF/Digital
-Unix.  The first processors announced offered downright shocking processor
-clock rates and performance, though other workstations and now even Pentium
-based PC's have since surpassed the original performance figures.
-
-The Alpha processors basically fit into two families, the original 21064/21164
-family and the low-end 21066/21068 family.  The 21064 family has an uncommitted
-128-bit data path to memory and cache.  DEC has implemented quite a range of
-system designs using this family, with both PCI and Turbo-Channel expansion,
-and also multi-processor server systems.  As CPU performance has moved along,
-DEC has enhanced the original design with higher clock speeds, on-board L2
-cache and 4 vs. 2-issue superscalar processor core.
-
-The 21066 family is a lower end version intended mostly for use in personal
-workstations.  In contrast to the 21064 it has only a 64-bit path to external
-memory and cache, with a built-in PCI bus interface.  As a result of the
-narrower data path, performance is about 2/3 that of the 21064 at the same
-clock speed.  DEC also hasn't done as much to enhance the speed or processor
-core and newer DEC systems are based on the 21064/21164 family with with PCI
-bus support chips, rather than the 21066.
-
-In the systems front, the 21064 based systems are common in the workplace and
-available though used workstation channels, but much of the recent interest
-in the Alpha family stems from the availability of the Multia/UDB systems and
-AXPpci33 motherboards in surplus channels at increasingly attractive prices.
-
-The Multia/UDB (same hardware, different software bundle) and AXPpci33 are
-based on the same 20164 reference design - the AXPpci33 is a "Baby AT"
-motherboard with PCI/ISA expansion slots, while the Multia/UDB is a very
-compact desktop system, with at most one PCI expansion slot, but with Video,
-Ethernet, PCMCIA slots and Audio built-in and also a SCSI hard drive and
-optional floppy drive.
-
-It is important to realize that, in today's terms, these systems are
-comparable in performance to mid-range Pentium based PC's - they benchmark
-better than many more expensive systems on the used workstation market,
-but don't expect miracles in comparison to Pentium-Pro 200 MHz systems.
-Both systems are available with 166 MHz and 233 Mhz Alpha chips, but
-the 166 Mhz systems are much more common and 233 Mhz ones command a
-substantial price premium.  So far, no source of cheap 233+ Mhz Alpha
-chips has turned up for upgrades.
-
-Which system to select depends on your intended use.  The AXPpci33 boards
-are cheaper and allow more peripheral expansion, but you must add case,
-power supply, cache chips, memory, SCSI drive, ethernet and a video card
-to get you near the working equivalent of the Multia/UDB systems.
-
-The Multia/UDB systems come in several models.  While the box supports
-one PCI slot, in the systems that have an internal 3.5" hard drive the
-PCI card area is blocked by the hard drive.  The SCSI controller is
-on a riser card that plugs into the PCI Bus on the mainboard and some
-versions of the riser don't make provision for an external SCSI bus
-connector or for the PCI expansion slot.  Some systems come with 3.5"
-2.88 MB floppy drives, but note that a low-profile note-book style drive
-with attached ribbon cable is used, rather than a standard PC style
-floppy drive.
-
-VX40 - These are the low-end systems, with a 166 MHz Alpha chip soldered
-       in and 256 K-byte cache soldered in.  The variants with no floppy,
-       no PCI slot and no external SCSI connector seem to be the most common.
-
-VX41 - These are the mid-range systems, most with socketed 166 MHz Alpha
-       chips and 256 K-byte of cache in a SIMM-socket.
-
-VX42 - These are the deluxe systems, essentially the same as as the VX41,
-       but all models have 233 Mhz Alpha chips and 512 K-byte cache.
-
-VX51 - This is the Pentium based member of the Multia family, and not
-       an alpha at all.
+This port is undergoing a lot of changes to improve stability and
+hardware coverage, although this release should be pretty usable.
diff --git a/distrib/notes/alpha/xfer b/distrib/notes/alpha/xfer
index bd0d6537ace..244ca1a94ad 100644
--- a/distrib/notes/alpha/xfer
+++ b/distrib/notes/alpha/xfer
@@ -133,7 +133,7 @@ NFS, you must do the following:
 	its mount daemon (mountd).  (Both of these actions will
 	probably require superuser privileges on the server.)
 
-	You need to know the the numeric IP address of the NFS
+	You need to know the numeric IP address of the NFS
 	server, and, if the server is not on a network directly
 	connected to the machine on which you're installing or
 	upgrading OpenBSD, you need to know the numeric IP address
diff --git a/distrib/notes/mvme68k/contents b/distrib/notes/mvme68k/contents
index bad42920f91..3860d3d334d 100644
--- a/distrib/notes/mvme68k/contents
+++ b/distrib/notes/mvme68k/contents
@@ -6,6 +6,22 @@ OpenBSDbsd
 
 OpenBSDrd
 
+		installboot	The OpenBSD/MACHINE boot loader
+				installation program.
+		bootxx		The OpenBSD/MACHINE boot block.
+		bootsd		The OpenBSD/MACHINE disk boot loader.
+		bootst		The OpenBSD/MACHINE tape boot loader.
+		rboot		A standalone bootrom for the MVME147, in
+				S-records format.
+		sboot		A network bootloader for the MVME147, in
+				S-records format.
+		stboot		A VID tape block.
+
+These files can be used to make a boot tape suitable for installation.
+They can also be used to configure an NFS server to support installation
+"over the network".  See the section "Getting the OpenBSD system onto
+Useful Media" for more information.
+
 DistributionDescription
 
 OpenBSDbase(11.2M,33.9M)
@@ -25,4 +41,3 @@ OpenBSDxbase
 OpenBSDxfont
 
 OpenBSDxserv
-
diff --git a/distrib/notes/mvme68k/hardware b/distrib/notes/mvme68k/hardware
index 9b0eb76956c..528fb62008a 100644
--- a/distrib/notes/mvme68k/hardware
+++ b/distrib/notes/mvme68k/hardware
@@ -6,10 +6,10 @@ OpenBSD/MACHINE OSREV runs on the following classes of machines:
 
 The minimal configuration requires 4M of RAM and ~60M of disk space.
 To install the entire system requires much more disk space, and to 
-compile the system, more RAM is recommended.  (OpenBSD with 4M of
-RAM feels like Solaris with 4M of RAM.) Note that until you have
+compile the system, more RAM is recommended (OpenBSD with 4M of
+RAM feels like Solaris with 4M of RAM). Note that until you have
 around 16M of RAM, getting more RAM is more important than getting a
-faster CPU.)
+faster CPU).
 
 Supported devices {:-include-:}:
 
@@ -23,7 +23,7 @@ MVME147:
 	SCSI:
 		on-board 
 
-	Parallel:
+	parallel:
 		a driver exists, but it is not integrated.
 
 MVME162:
@@ -32,14 +32,10 @@ MVME162:
 
 	ethernet:
 		on-board Intel 82596CA ethernet ("ie0")
-		MVME376 VME bus ehternet ("le*")
 
 	SCSI:
 		on-board SCSI controller NCR53c710
 
-	Parallel:
-		Not available for this board
-
 	VME:
 		drivers for short I/O access
 
@@ -58,16 +54,15 @@ MVME162:
 	IP:
 		untested
 
-MVME167
+MVME167:
 	serial:
 		on-board tty00 - tty03 - Cirrus Logic CD2401
 	ethernet: 
 		on-board Intel 82596CA ethernet ("ie0")
-		MVME376 VME bus ehternet ("le*")
 	SCSI: 
 		on-board SCSI controller NCR53c710
 
-	Parallel:
+	parallel:
 		Not supported
 
 	SRAM:
@@ -76,16 +71,17 @@ MVME167
 	VMEbus:
 		supported
 		
-MVME177
+MVME177:
 	serial:
 		on-board tty00 - tty03 - Cirrus Logic CD2401
+
 	ethernet: 
 		on-board Intel 82596CA ethernet ("ie0")
-		MVME376 VME bus ehternet ("le*")
+
 	SCSI: 
 		on-board SCSI controller NCR53c710
 
-	Parallel:
+	parallel:
 		Not supported
 
 	SRAM:
@@ -94,3 +90,9 @@ MVME177
 	VMEbus:
 		supported
 		
+
+Additional VMEbus devices {:-include-:}:
+
+	MVME328 SCSI controller ("vs")
+
+	MVME376 VME bus ethernet ("le*")
diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install
index 4443bb43f58..d1895a3e44c 100644
--- a/distrib/notes/mvme68k/install
+++ b/distrib/notes/mvme68k/install
@@ -1,5 +1,4 @@
-Installing OpenBSD is a relatively complex process, but if you have
-this document in hand it shouldn't be too much trouble.
+OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
 in terms of preliminary setup is to use the OpenBSD ramdisk kernel that can
@@ -92,7 +91,7 @@ A few configuration files need to be edited:
 			server:/export/root/client       /     nfs  rw 0 0
 			server:/export/exec/sun4.OpenBSD /usr  nfs  rw 0 0
 
-Now you must populate the the `/dev' directory for your client. If you server
+Now you must populate the `/dev' directory for your client. If you server
 runs SunOS 4.x, you can simply change your working directory to `<root>/dev'
 and run the MAKEDEV script: `sh MAKEDEV all'.
 
@@ -160,30 +159,34 @@ the editor), then try setting it to `8 partitions:'.
 
 <BEGIN SAMPLE DISKLABEL SCREEN>
 OpenBSD# disklabel sd2
- # /dev/rsd2c:
-type: SCSI 
+# /dev/rsd2c:
+type: SCSI
 disk: SCSI disk
 label: Hold Your Breath
 flags:
 bytes/sector: 512
-sectors/track: 64
-tracks/cylinder: 7  
-sectors/cylinder: 448
-cylinders: 1429
+sectors/track: 124
+tracks/cylinder: 8
+sectors/cylinder: 992
+cylinders: 4177
+total sectors: 4165271
 rpm: 3600
 interleave: 1
 trackskew: 0
 cylinderskew: 0
-headswitch: 0           # milliseconds
-track-to-track seek: 0  # milliseconds
+headswitch: 0           # microseconds
+track-to-track seek: 0  # microseconds
 drivedata: 0
 
 8 partitions:
 #        size   offset    fstype   [fsize bsize   cpg]
-  a:    50176        0    4.2BSD        0     0     0   # (Cyl.    0 - 111)
-  b:    64512    50176      swap                        # (Cyl.  112 - 255)
-  c:   640192        0   unknown                        # (Cyl.    0 - 1428)
-  d:   525504   114688    4.2BSD        0     0     0   # (Cyl.  256 - 1428)
+  a:    80000        0    4.2BSD     1024  8192    16   # (Cyl.    0 - 80*)
+  b:   256000    80000      swap                        # (Cyl.   80*- 338*)
+  c:  4165271        0    unused        0     0         # (Cyl.    0 - 4198*)
+  d:  3229271   936000    4.2BSD     1024  8192    16   # (Cyl.  943*- 4198*)
+  f:   100000   336000    4.2BSD     1024  8192    16   # (Cyl.  338*- 439*)
+  g:   100000   436000    4.2BSD     1024  8192    16   # (Cyl.  439*- 540*)
+  h:   400000   536000    4.2BSD     1024  8192    16   # (Cyl.  540*- 943*)
 <END SAMPLE DISKLABEL SCREEN>
 
 
@@ -214,6 +217,21 @@ The installation script goes through the following phases:
 	- extraction of the distribution tar files
 	- installation of boot programs
 
+OpenBSDFTPInstall
+
+OpenBSDHTTPInstall
+
+OpenBSDTAPEInstall
+
+OpenBSDNFSInstall
+
+OpenBSDDISKInstall(,{:-only-:})
+
+OpenBSDCommonFS
+
+OpenBSDCommonURL
+
+After completing an installation:
 
 Now try a reboot.  (If needed, swap your scsi id's first).  Initially
 I'd suggest you "bo bsd -bs", then try multiuser after that.
diff --git a/distrib/notes/mvme68k/upgrade b/distrib/notes/mvme68k/upgrade
index 0842326c507..81ae6caa65e 100644
--- a/distrib/notes/mvme68k/upgrade
+++ b/distrib/notes/mvme68k/upgrade
@@ -1,6 +1 @@
-To upgrade to OpenBSD OSREV from a previous version follow the instructions
-in the section "Installing OpenBSD", but run the script `upgrade.sh'
-in stead of `install.sh'.
-
-The upgrade script will use the existing disk partitions to install the
-new system in, and also preserves the files in `/etc'.
+OpenBSDUpgrade
diff --git a/distrib/notes/mvme68k/xfer b/distrib/notes/mvme68k/xfer
index 221c6cb9f4a..24076e049e5 100644
--- a/distrib/notes/mvme68k/xfer
+++ b/distrib/notes/mvme68k/xfer
@@ -1,7 +1,10 @@
 Installation is supported from several media types, including:
-	NFS partitions
-	FTP
+
+	FFS partitions
 	Tape
+	Remote NFS partitions
+	FTP
+	HTTP
 
 The steps necessary to prepare the distribution sets
 for installation depend on which method of installation