Round up more edges.

7 files changed, 263 insertions, 375 deletions

diff --git a/distrib/notes/amd64/contents b/distrib/notes/amd64/contents
index d5b118e087a..6a747ed7fbd 100644
--- a/distrib/notes/amd64/contents
+++ b/distrib/notes/amd64/contents
@@ -1,9 +1,9 @@
-dnl	$OpenBSD: contents,v 1.2 2004/02/07 21:44:40 miod Exp $
+dnl	$OpenBSD: contents,v 1.3 2004/02/07 22:47:49 miod Exp $
 TopPart
 dnl uncomment as stuff becomes available
 dnl
 dnl OpenBSDfloppy
-dnl 
+dnl
 dnl		floppyB{:--:}OSrev.fs	Another MACHINE boot and installation floppy;
 dnl				this one features all the drivers not available
 dnl				in floppy{:--:}OSrev.fs, such as SCSI, RAID, gigabit
@@ -25,38 +25,41 @@ OpenBSDrd
 
 OpenBSDcd
 
-As well you may be interested in
-
-.../OSREV/tools/
-		miscellaneous MACHINE installation utilities like
-		rawrite.exe, ntrw.exe, gzip.exe, and pfdisk.exe;
-		see installation section, below.
-
+dnl Uncomment when floppies are available, and if this really is
+dnl worth providing...
+dnl
+dnl As well you may be interested in
+dnl
+dnl .../OSREV/tools/
+dnl		miscellaneous MACHINE installation utilities like
+dnl		rawrite.exe, ntrw.exe, gzip.exe, and pfdisk.exe;
+dnl		see installation section, below.
+dnl
 dnl
 dnl uncomment as stuff becomes available
 dnl OpenBSDfloppydesc(three,Each,s)
-
-In addition, the "tools/" directory contains some utilities that might be
-useful for the installation.
-
+dnl
+dnl In addition, the "tools/" directory contains some utilities that might be
+dnl useful for the installation.
+dnl
 DistributionDescription(six)
 
 OpenBSDbase
 
 OpenBSDcomp
 
-OpenBSDetc
+OpenBSDetc(,,noupgrade)
 
 OpenBSDgame
 
 OpenBSDman
 
 OpenBSDmisc
-dnl 
+dnl
 dnl OpenBSDxbase
-dnl 
+dnl
 dnl OpenBSDxfont
-dnl 
+dnl
 dnl OpenBSDxserv
-dnl 
+dnl
 dnl OpenBSDxshare
diff --git a/distrib/notes/amd64/hardware b/distrib/notes/amd64/hardware
index bf8844543c3..02a2c129fa9 100644
--- a/distrib/notes/amd64/hardware
+++ b/distrib/notes/amd64/hardware
@@ -1,38 +1,17 @@
-dnl	$OpenBSD: hardware,v 1.2 2004/02/07 21:35:56 deraadt Exp $
-OpenBSD/MACHINE OSREV works across a broad range of standard PC's and
-clones, with a wide variety of processors and I/O bus architectures.  It
-can be expected to install and run with minimal difficulties on most
-current products.  The cases where problems may be encountered are
-typically older proprietary PC's, laptops or specialized server boxes
-that rely on a custom BIOS to paper over implementation differences.
+dnl	$OpenBSD: hardware,v 1.3 2004/02/07 22:47:49 miod Exp $
+OpenBSD/MACHINE OSREV should work on all Athlon 64-based designs.
 
 OpenBSD does not currently support multiple processors (SMP), but will
 run using one processor on a multi-processor system board.
 
-The minimal configuration to install the system is 12M or 16M of RAM and
-perhaps 100M of disk space.  A custom kernel might be able to run with only
-8MB.  To install the entire system requires much more disk space, and to run
-X or compile the system, more RAM is recommended.  (16M of RAM will actually
-allow you to run X and/or compile but it won't be speedy. Note that until
-you have around 32M of RAM, getting more RAM is more important than getting
-a faster CPU.)
-
 Supported hardware {:-include-:}:
 	Processors
 		All versions of the AMD Athlon 64 processors
 	Buses
-		All standard ISA, EISA, VLB, and PCI bus based machines,
-		including:
-			Intel 450GX/KX based machines
-			Intel 450NX based machines
-			ServerWorks chipset-based machines
-			(We just had to mention those last three, since
-			 they are the hardest to support)
+		All standard ISA and PCI bus bridges
 		Both 16-bit PCMCIA Cards and newer 32-bit CardBus
 		support
 		Universal Serial Bus (USB)
-		The MCA bus found in various IBM PS/2 machines is not
-		supported.
 	Bus Interfaces
 		Standard PCI-PCI bridges, including PCI expansion
 		backplanes
@@ -68,61 +47,61 @@ Supported hardware {:-include-:}:
 		Silicon Image SiI3112
 	SCSI Host Adapters
 		Adaptec AHA-1540, AHA-154xA, AHA-154xB, AHA-1542C,
-		    AHA-1542CF, AHA-1542CP, AHA-1640 [B] [C]
-		Adaptec AHA-174x [B] [C]
-		Adaptec AIC-6260 and AIC-6360 based boards, including: [B]
+		    AHA-1542CF, AHA-1542CP, AHA-1640
+		Adaptec AHA-174x
+		Adaptec AIC-6260 and AIC-6360 based boards, including:
 		    the Adaptec AHA-152x and the SoundBlaster SCSI host adapter.
 		    (Note that you cannot boot from these boards if they do not
 		    have a boot ROM; only the AHA-152x and motherboards using
 		    this chip are likely to be bootable, consequently.)
 		Adaptec AIC-7770-based boards, including the Adaptec
-		    AHA-274x and AHA-284x families) [C]
+		    AHA-274x and AHA-284x families)
 		Adaptec AHA-[23]94x[W] cards and some on-board PCI designs
-		    using the AIC7870 and AIC7880 chips. [C]
+		    using the AIC7870 and AIC7880 chips.
 		Adaptec AHA-[23]94xU[2W] cards and some on-board PCI designs
-		    using the AIC789[01], AIC7895, AIC789[67] chips [C]
+		    using the AIC789[01], AIC7895, AIC789[67] chips
 		Adaptec AIC-789[29] chips and products like the
-		    AHA-29160 based upon it which do 160MB/sec SCSI. [C]
+		    AHA-29160 based upon it which do 160MB/sec SCSI.
 		    (However, the 7899G card is currently not supported with
 		     more than one device attached)
 		AdvanSys 'U', 'UW', 'U2W' and 'U160' PCI SCSI
 		    controllers including the ABP940U[AW],
-		    ASB3940U[AW]-00, ASB3940U2W-00 and ASB3950U160 [A] [B] [C]
-		AMD Am53c974 PCscsi-PCI SCSI controllers, including: [A] [B] [C]
+		    ASB3940U[AW]-00, ASB3940U2W-00 and ASB3950U160
+		AMD Am53c974 PCscsi-PCI SCSI controllers, including:
 		    Tekram DC-390
-		Buslogic BT-54x (Adaptec AHA-154x clones) [B] [C]
+		Buslogic BT-54x (Adaptec AHA-154x clones)
 		BusLogic 445, 74x, 9xx  (but not the new "FlashPoint" series
-		    of BusLogic SCSI adapters) [B] [C]
+		    of BusLogic SCSI adapters)
 		Initio INIC-940 and INIC-950 based PCI SCSI host
-		  adapters, including: [A] [C]
+		  adapters, including:
 		    Initio INI-9090U
 		    Initio INI-9100U/UW
 		    Iwill 2935UW
 		    DTC Domex 3194U Plus
-		QLogic PCI SCSI controllers [A] [C]
-		Seagate/Future Domain ISA SCSI adapter cards, including: [B] [C]
+		QLogic PCI SCSI controllers
+		Seagate/Future Domain ISA SCSI adapter cards, including:
 		    ST01/02
 		    Future Domain TMC-885
 		    Future Domain TMC-950
 		Symbios Logic (NCR) 53C8xx, 53C1010, and 53C1510D-based
 		  PCI SCSI host adapters (including generic/no name cards, old
 		  ASUS cards, the DTC-3130 series, Diamond Fireport series,
-		  etc.) [B] [C]
-		Tekram DC-300B and DC-320E (Adaptec AHA-154x clones) [B] [C]
+		  etc.)
+		Tekram DC-300B and DC-320E (Adaptec AHA-154x clones)
 		Tekram DC-3x5U (DC-315U, DC-395U/UW/F) TRM-S1040 based
-		  PCI SCSI host adapters [A] [C]
-		Ultrastor 14f, 24f, and 34f [A] [C]
-		WD-7000 SCSI host adapters [A] [B] [C]
+		  PCI SCSI host adapters
+		Ultrastor 14f, 24f, and 34f
+		WD-7000 SCSI host adapters
 	RAID and Cache Controllers
-		3ware Escalade 3W-5x00, 3W-6x00 [A] [C]
-		Adaptec FSA-based RAID controllers, including: [A] [C]
+		3ware Escalade 3W-5x00, 3W-6x00
+		Adaptec FSA-based RAID controllers, including:
 		    Adaptec AAC-2622, AAC-364, AAC-3642
 		    Dell PERC 2/Si, PERC 2/QC, PERC 3/Si, PERC 3/Di,
 		      PERC 3/QC
 		    HP NetRAID-4M
 		American Megatrends Inc. MegaRAID controllers in "Mass
-		  Storage" mode [A] [C]
-		Compaq Smart ARRAY PCI/EISA adapters, including: [A] [C]
+		  Storage" mode
+		Compaq Smart ARRAY PCI/EISA adapters, including:
 		    Compaq Integrated Array
 		    Compaq IAES
 		    Compaq IDA, IDA-2
@@ -131,9 +110,9 @@ Supported hardware {:-include-:}:
 		      4250ES, 431
 		    Compaq SMART, SMART-2/E, SMART-2/P, SMART-2DH,
 		      SMART-2SL
-		DPT SmartCache and SmartRaid III/IV PCI/EISA adapters [A] [C]
-		Intel (and formerly ICP-Vortex) GDT series [A] [C]
-		I2O (intelligent I/O) RAID controllers, including: [A] [C]
+		DPT SmartCache and SmartRaid III/IV PCI/EISA adapters
+		Intel (and formerly ICP-Vortex) GDT series
+		I2O (intelligent I/O) RAID controllers, including:
 		    Adaptec SCSI RAID (ASR-2100S, ASR-2110S, ASR-3200S,
 		      etc)
 		    American Megatrends Inc. MegaRAID controllers
@@ -148,7 +127,7 @@ Supported hardware {:-include-:}:
 		Most ATAPI CD-ROM, CD-R, CD-RW, and DVD drives
 	Tape Drives
 		Most SCSI tape drives
-		Most SCSI tape changers [G]
+		Most SCSI tape changers
 		QIC-02 and QIC-36 format (Archive- and Wangtek-
 		   compatible) tape drives [*]
 	MDA, CGA, VGA, SVGA, and HGC Display Adapters.  (Note that not
@@ -160,20 +139,20 @@ Supported hardware {:-include-:}:
 		16550-based ports
 		ST16660-base ports
 		XR16850-based ports (only in the pccom driver)
-		AST-style 4-port serial boards [G]
+		AST-style 4-port serial boards
 		BOCA 8-port serial cards [*]
-		Cyclades Cyclom-{4, 8, 16}Y serial boards [G]
-		Cyclades-Z series multiport serial boards [G]
+		Cyclades Cyclom-{4, 8, 16}Y serial boards
+		Cyclades-Z series multiport serial boards
 		IBM PC-RT 4-port serial boards [*]
 		Addonics FlexPort 8S [*]
 	Parallel Ports
-		Any standard parallel port [G]
+		Any standard parallel port
 	Communication Controllers
 		Universal Serial Bus host controllers, including:
-		    USB Universal Host Controller [A] [B] [C]
-		    USB Open Host Controller [A] [B] [C]
+		    USB Universal Host Controller
+		    USB Open Host Controller
 		PCI `universal' communication cards, providing serial
-		  and parallel ports, including: [G]
+		  and parallel ports, including:
 		    Dolphin Peripherals 4014 (dual parallel) and
 			4035 (dual serial)
 		    SIIG Cyber 2P1S (dual parallel, single serial)
@@ -223,13 +202,13 @@ Supported hardware {:-include-:}:
 		    SUNIX 408x (2 port serial and 2 port parallel)
 		    SUNIX 409x (4 port serial and 2 port parallel)
 	Ethernet Adapters
-		3Com 3c501 [A] [B] [C]
-		3Com 3c503 [B]
-		3Com 3c505 [A] [B] [C]
-		3Com 3c507 [A] [B] [C]
+		3Com 3c501
+		3Com 3c503
+		3Com 3c505
+		3Com 3c507
 		3Com 3c509, 3c579, and 3c59x (disabling PnP on 3c509B is
 		    recommended)
-		3Com 3c515 [B]
+		3Com 3c515
 		3Com 3c9xx Etherlink XL adapters, including:
 		    3Com 3c900/3c900B PCI adapters
 		    3Com 3c905/3c905B/3c905C PCI adapters
@@ -244,13 +223,12 @@ Supported hardware {:-include-:}:
 		    Dell Latitude laptop docking station embedded
 			3c905
 		    NVidia nForce2 integrated 3Com 9201 (nForce2-ST, nForce2-GT)
-		3Com 3c990 3XP Typhoon/Sidewinder PCI adapters, including: [A]
-		  [B] [C]
+		3Com 3c990 3XP Typhoon/Sidewinder PCI adapters, including:
 		    3C990-TX-95
 		    3C990-TX-97
 		    3C990-TX-SVR95
 		    3C990-TX-SVR97
-		Adaptec "Starfire" AIC-6915 based PCI adapters, including: [G]
+		Adaptec "Starfire" AIC-6915 based PCI adapters, including:
 		    Adaptec Single32 ANA-69011
 		    Adaptec Single64 ANA-62011 and ANA-62020
 		    Adaptec Duo64 ANA-62022
@@ -260,7 +238,7 @@ Supported hardware {:-include-:}:
 		    Accton EN2242 MiniPCI
 		    Linksys LNE100TX v4.x
 		    Mototech ME316
-		ADMtek AN986-based USB adapters, including: [A] [B] [C]
+		ADMtek AN986-based USB adapters, including:
 		    Abocom UFE1000
 		    Abocom DSB650TX
 		    Accton USB320-EC
@@ -280,23 +258,23 @@ Supported hardware {:-include-:}:
 		    SMC 2202USB
 		    SMC EZ Connect USB
 		    SOHOware NUB100
-		AMD LANCE and PCnet-based ISA Ethernet adapters, including: [B]
+		AMD LANCE and PCnet-based ISA Ethernet adapters, including:
 		    Novell NE1500T
 		    Novell NE2100
 		    Kingston 21xx
-		AMD PCnet-based PCI Ethernet adapters, including: [B] [C]
+		AMD PCnet-based PCI Ethernet adapters, including:
 		    BOCALANcard/PCI
 		    AT&T StarLAN 10, EN100, and StarLAN Fiber
 		ASIX 88140A/88141 PCI Ethernet adapters, including:
 		    CNet Pro110B
 		    Alfa Inc. GFC2204
-		CATC USB-EL1210A-based USB adapters, including: [G]
+		CATC USB-EL1210A-based USB adapters, including:
 		    CATC Netmate and Netmate II
 		    Belkin F5U011/F5U111
 		Davicom DM9009, DM9100, DM9102, and DM9102A based PCI adapters,
 		including:
 		    Jaton XpressNet
-		DEC EtherWORKS III adapters, including: [G]
+		DEC EtherWORKS III adapters, including:
 		    DEC DE203, DE204, DE205
 		Digital DC21x4x-based PCI Ethernet adapters, including:
 		    Older SMC PCI EtherPower 10, 10/100 (models
@@ -315,8 +293,8 @@ Supported hardware {:-include-:}:
 		    CompuShack Goldline Quattro
 		    Phobos P430TX
 		    Znyx ZX346
-		Intel EtherExpress 16 [A] [B] [C]
-		Intel EtherExpress PRO/10 ISA [A] [B] [C]
+		Intel EtherExpress 16
+		Intel EtherExpress PRO/10 ISA
 		Intel i8255x-based (except the i82556) PCI adapters,
 		including:
 		    Intel EtherExpress PRO/10+
@@ -325,8 +303,7 @@ Supported hardware {:-include-:}:
 		    Intel EtherExpress PRO/100 Dual Port
 		    Intel PRO/100 VE, PRO/100 VM, and PRO/100 S
 		Intel 21145-based PCI adapters
-		Kawasaki LSI KL5KUSB101B-based USB adapters, including: [A]
-		  [B] [C]
+		Kawasaki LSI KL5KUSB101B-based USB adapters, including:
 		    3Com 3c19250
 		    3Com 3c460 HomeConnect
 		    ADS Technologies USB-10T
@@ -356,9 +333,9 @@ Supported hardware {:-include-:}:
 		    SVEC PN102-TX Fast Ethernet card
 		Myson Technologies MTD803 3-in-1 Fast Ethernet adapters
 		National Semiconductor DP83815-based PCI adapters,
-		  including: [B] [C]
+		  including:
 		    Netgear FA311/FA312
-		Novell NE1000, NE2000 [B]
+		Novell NE1000, NE2000
 		RealTek 8129, RealTek 8139 Ethernet adapters, including:
 		    Accton MPX 5030/5038
 		    Allied Telesyn AT2550
@@ -372,24 +349,24 @@ Supported hardware {:-include-:}:
 		    Nortel BayStack 21
 		    OvisLink LEF-8129TX, LEF-8139TX
 		    SMC EZ Card 10/100 PCI 1211-TX
-		RealTek RTL8150L based USB adapters, including: [G]
+		RealTek RTL8150L based USB adapters, including:
 		    Melco Inc. LUA-KTX
 		    GreenHouse GH-USB100B
 		    Linksys USB100M
-		SiS 900 and SiS 7016-based PCI adapters, including: [B] [C]
+		SiS 900 and SiS 7016-based PCI adapters, including:
 		    Mototech ME313
 		    NetSurf NS-KFE30D
-		SMC/WD 8003, 8013, and the SMC "Elite16" ISA boards [B]
-		SMC/WD 8216 (the SMC "Elite16 Ultra" ISA boards) [B]
+		SMC/WD 8003, 8013, and the SMC "Elite16" ISA boards
+		SMC/WD 8216 (the SMC "Elite16 Ultra" ISA boards)
 		  (See special notice later in this document)
-		SMC 8416 EtherEZ PnP (with PnP mode off) [B]
-		SMC 9432 (EtherPower II) EPIC 10/100 [C]
-		Sun Happy Meal PCI adapters, including: [G]
+		SMC 8416 EtherEZ PnP (with PnP mode off)
+		SMC 9432 (EtherPower II) EPIC 10/100
+		Sun Happy Meal PCI adapters, including:
 		    Fast Ethernet
 		    Quad Fast Ethernet
-		Sundance ST201-based PCI adapters, including: [G]
+		Sundance ST201-based PCI adapters, including:
 		    D-Link DFE-550TX
-		Texas Instruments ThunderLAN PCI adapters, including: [C]
+		Texas Instruments ThunderLAN PCI adapters, including:
 		    Compaq Netelligent PCI Adapters
 		    Compaq NetFlex 3/P
 		    Compaq Deskpro integrated adapter
@@ -397,65 +374,63 @@ Supported hardware {:-include-:}:
 		    Olicom OC2135, OC2183, OC2325, OC2326
 		    Racore 8165 and 8148
 		    TI ThunderLAN adapters
-		VIA Rhine/RhineII/RhineIII Ethernet adapters, including: [C]
+		VIA Rhine/RhineII/RhineIII Ethernet adapters, including:
 		    Addtron AEF-360TX
 		    Hawking PN102TX
 		    D-Link DFE530TX
-		Winbond W89C840F Ethernet adapters, including: [A]
+		Winbond W89C840F Ethernet adapters, including:
 		    Trendware TE100-PCIE
 		    Compex RL100-ATX 10/100baseTX
 	Wireless Ethernet Adapters
 		Compact Flash Adapters (will show up as PCMCIA adapters)
-		    Buffalo AirStation CF [A] [B] [C]
-		    ELSA XI800 CF [A] [B] [C]
+		    Buffalo AirStation CF
+		    ELSA XI800 CF
 		PCMCIA Adapters
-		    3Com AirConnect 3CRWE737A PCMCIA [A] [B] [C]
-		    ACTIONTEC HWC01170 PCMCIA [A] [B] [C]
-		    Addtron AWP-100 PCMCIA [A] [B] [C]
-		    Agere Orinoco PCMCIA [A] [B] [C]
-		    Aironet 4500/4800 802.11DS ISA PnP, PCMCIA and PCI [A] [B]
-		    BUFFALO AirStation PCMCIA [A] [B] [C]
-		    Cabletron RoamAbout PCMCIA [A] [B] [C]
-		    Cisco 340/350 802.11DS PCMCIA and PCI [A] [B]
-		    Compaq Agency NC5004 PCMCIA [A] [B] [C]
-		    Contec FLEXLAN/FX-DS110-PCC PCMCIA [A] [B] [C]
-		    Corega PCC-11 PCMCIA [A] [B] [C]
-		    Corega PCCA-11 PCMCIA [A] [B] [C]
-		    Corega PCCB-11 PCMCIA [A] [B] [C]
-		    Corega CGWLPCIA11 PCMCIA [A] [B] [C]
-		    Dlink DWL650 PCMCIA [A] [B] [C]
-		    ELSA XI300 PCMCIA [A] [B] [C]
-		    ELSA XI325 PCMCIA [A] [B] [C]
-		    ELSA XI325H PCMCIA [A] [B] [C]
-		    EMTAC A2424i PCMCIA [A] [B] [C]
-		    Ericsson Wireless LAN CARD C11 PCMCIA [A] [B] [C]
-		    Gemtek WL-311 PCMCIA [A] [B] [C]
-		    Hawking Technology WE110P PCMCIA [A] [B] [C]
-		    I-O DATA WN-B11/PCM PCMCIA [A] [B] [C]
-		    Intel PRO/Wireless 2011 PCMCIA [A] [B] [C]
-		    Intersil Prism II PCMCIA [A] [B] [C]
-		    Linksys Instant Wireless WPC11 PCMCIA [A] [B] [C]
+		    3Com AirConnect 3CRWE737A PCMCIA
+		    ACTIONTEC HWC01170 PCMCIA
+		    Addtron AWP-100 PCMCIA
+		    Agere Orinoco PCMCIA
+		    Aironet 4500/4800 802.11DS ISA PnP, PCMCIA and PCI
+		    BUFFALO AirStation PCMCIA
+		    Cabletron RoamAbout PCMCIA
+		    Cisco 340/350 802.11DS PCMCIA and PCI
+		    Compaq Agency NC5004 PCMCIA
+		    Contec FLEXLAN/FX-DS110-PCC PCMCIA
+		    Corega PCC-11 PCMCIA
+		    Corega PCCA-11 PCMCIA
+		    Corega PCCB-11 PCMCIA
+		    Corega CGWLPCIA11 PCMCIA
+		    Dlink DWL650 PCMCIA
+		    ELSA XI300 PCMCIA
+		    ELSA XI325 PCMCIA
+		    ELSA XI325H PCMCIA
+		    EMTAC A2424i PCMCIA
+		    Ericsson Wireless LAN CARD C11 PCMCIA
+		    Gemtek WL-311 PCMCIA
+		    Hawking Technology WE110P PCMCIA
+		    I-O DATA WN-B11/PCM PCMCIA
+		    Intel PRO/Wireless 2011 PCMCIA
+		    Intersil Prism II PCMCIA
+		    Linksys Instant Wireless WPC11 PCMCIA
 		    Linksys Instant Wireless WPC11 2.5 PCMCIA
-		      [A] [B] [C]
 		    Linksys Instant Wireless WPC11 3.0 PCMCIA
-		      [A] [B] [C]
-		    Lucent WaveLAN PCMCIA [A] [B] [C]
-		    NANOSPEED ROOT-RZ2000 PCMCIA [A] [B] [C]
-		    NEC CMZ-RT-WP PCMCIA [A] [B] [C]
-		    Netgear MA401 PCMCIA [A] [B] [C]
-		    Netgear MA401RA PCMCIA [A] [B] [C]
-		    Nokia C020 Wireless LAN PCMCIA [A] [B] [C]
-		    Nokia C110/C111 Wireless LAN PCMCIA [A] [B] [C]
-		    NTT-ME 11Mbps Wireless LAN PCMCIA [A] [B] [C]
-		    Proxim Harmony PCMCIA [A] [B] [C]
-		    Proxim RangeLAN-DS PCMCIA [A] [B] [C]
-		    RayLink Aviator2.4/Pro 802.11FH PCMCIA [A] [B]
-		    Samsung MagicLAN SWL-2000N PCMCIA [A] [B] [C]
-		    SMC 2632 EZ Connect PCMCIA [A] [B] [C]
-		    Symbol Spectrum24 PCMCIA [A] [B] [C]
-		    TDK LAK-CD011WL PCMCIA [A] [B] [C]
-		    US Robotics 2410 PCMCIA [A] [B] [C]
-		    US Robotics 2445 PCMCIA [A] [B] [C]
+		    Lucent WaveLAN PCMCIA
+		    NANOSPEED ROOT-RZ2000 PCMCIA
+		    NEC CMZ-RT-WP PCMCIA
+		    Netgear MA401 PCMCIA
+		    Netgear MA401RA PCMCIA
+		    Nokia C020 Wireless LAN PCMCIA
+		    Nokia C110/C111 Wireless LAN PCMCIA
+		    NTT-ME 11Mbps Wireless LAN PCMCIA
+		    Proxim Harmony PCMCIA
+		    Proxim RangeLAN-DS PCMCIA
+		    RayLink Aviator2.4/Pro 802.11FH PCMCIA
+		    Samsung MagicLAN SWL-2000N PCMCIA
+		    SMC 2632 EZ Connect PCMCIA
+		    Symbol Spectrum24 PCMCIA
+		    TDK LAK-CD011WL PCMCIA
+		    US Robotics 2410 PCMCIA
+		    US Robotics 2445 PCMCIA
 		PCI Adapters
 		    3Com AirConnect 3CRWE777A PCI
 		    Belkin F5D6000 PCI (a rebadged WL11000P)
@@ -469,8 +444,7 @@ Supported hardware {:-include-:}:
 		    Netgear MA301 PCI
 		    US Robotics 2415 PCI (rebadged WL11000P)
 	Gigabit Ethernet Adapters
-		Alteon Tigon I/II PCI Gigabit Ethernet boards, including: [A]
-		  [B] [C]
+		Alteon Tigon I/II PCI Gigabit Ethernet boards, including:
 		    3Com 3c985 and 3c985B
 		    Alteon ACEnic V (fiber and copper)
 		    Digital EtherWORKS 1000SX
@@ -496,7 +470,7 @@ Supported hardware {:-include-:}:
 		      (PWLA8492MF)
 		    Intel PRO/1000MF Server Adapter (LX Fiber) (PWLA8490LX)
 		National Semiconductor DP83280 and DP83281 based PCI
-		adapters, including: [A] [B] [C]
+		adapters, including:
 		    Addtron AEG320T
 		    Asante FriendlyNet GigaNIX 1000TA and 1000TPC
 		    D-Link DGE-500T
@@ -507,8 +481,7 @@ Supported hardware {:-include-:}:
 		Level1 LXT1001 based adapters (untested), including: [*]
 		    SMC TigerCard 1000
 		    D-Link DGE-500SX
-		Broadcom BCM570x (Tigon3) based PCI adapters, including: [A]
-		  [B] [C]
+		Broadcom BCM570x (Tigon3) based PCI adapters, including:
 		    3Com 3c996-T
 		    3Com 3c996-SX
 		    3Com 3c996B-T
@@ -517,11 +490,10 @@ Supported hardware {:-include-:}:
 		    Netgear GA302T
 		    SysKonnect SK-9D21
 		    SysKonnect SK-9D41
-		Sundance/Tamarack TC9021 based PCI adapters, including: [G]
+		Sundance/Tamarack TC9021 based PCI adapters, including:
 		    D-Link DGE-550T (10/100/1000baseTX)
 		    Antares Microsystems Gigabit Ethernet board
 		SysKonnect and Marvell based adapters, including:
-		  [A] [B] [C]
 		    SysKonnect SK-9821 (1000baseT)
 		    SysKonnect SK-9822 (dual 1000baseT)
 		    SysKonnect SK-9841 (1000baseLX)
@@ -540,23 +512,23 @@ Supported hardware {:-include-:}:
 		Efficient Networks EN-155 and Adaptec ANA-590X ATM
 		interfaces [*]
 	FDDI Adapters
-		Digital DEFEA EISA and PCI FDDI adapters [G]
+		Digital DEFEA EISA and PCI FDDI adapters
 	Wan Adapters
 		Lan Media Corporation SSI (T1)/HSSI/DS1/DS3 WAN
-		interfaces [G]
+		interfaces
 	Cryptography Accelerators
 		Broadcom Bluesteelnet uBsec 5501, 5601, 5801, 5802, 5805,
-		  5820, 5821, 5822, 5823 [G]
-		Hifn 6500-based boards [G]
+		  5820, 5821, 5822, 5823
+		Hifn 6500-based boards
 		Hifn 7751/7811/7951/7955/7956-based boards (hifn),
-		  including: [G]
+		  including:
 		    Soekris Engineering vpn1201, vpn1211, vpn1401, and vpn1411
 		    GTGI PowerCrypt Encryption Accelerator
 		    NetSec 7751
 		    Hifn 7751 and 9751 reference boards
 		    Invertex AEON
-		SafeNet SafeXcel 1141/1741 [G]
-	PC Cards (PCMCIA [B] and CardBus [B] [C])
+		SafeNet SafeXcel 1141/1741
+	PC Cards (PCMCIA and CardBus)
 		ATA cards, including:
 		    ATA/IDE card drives
 		    ATA/IDE CD-ROM adapters
@@ -642,28 +614,28 @@ Supported hardware {:-include-:}:
 		    cards should work
 		Wireless Ethernet adapters:
 		    See above
-	Universal Serial Bus (USB) Devices [A] [B] [C]
-		USB Audio [G]
-		USB Diamond Multimedia Rio MP3 players [G]
-		USB Ethernet adapters, see above [G]
-		USB Generic Human Interface Devices (catch-all) [G]
-		USB Handspring Visor [G]
+	Universal Serial Bus (USB) Devices
+		USB Audio
+		USB Diamond Multimedia Rio MP3 players
+		USB Ethernet adapters, see above
+		USB Generic Human Interface Devices (catch-all)
+		USB Handspring Visor
 		USB Hubs
 		USB Keyboards
 		USB Mass Storage devices, i.e., USB floppy drives and
 		  USB memory stick controllers
-		USB Mice [G]
-		USB Modems [G]
-		USB Printers [G]
-		USB Scanners [G]
-		USB-USB cables [G]
+		USB Mice
+		USB Modems
+		USB Printers
+		USB Scanners
+		USB-USB cables
 		USB Y@p phone [*]
-	Pointing Devices [G]
+	Pointing Devices
 		"Logitech"-style bus mice
 		"Microsoft"-style bus mice
 		"PS/2"-style mice
 		Serial mice (uses serial port driver)
-	Sound Devices [G]
+	Sound Devices
 		AMD 768 and 8111 AC'97
 		C-Media CMI8[37]38
 		Cirrus Logic CrystalClear CS4280, CS4281
@@ -703,14 +675,14 @@ Supported hardware {:-include-:}:
 	Miscellaneous Devices
 		APM power management,
 		Brooktree 8[47][89] based frame grabber and TV tuner cards,
-		including: [G]
+		including:
 		    Hauppauge Wincast TV
 		    STB TV PCI Television Tuner
 		    Miro PC TV
 		    Intel Smart Video Recorder III
 		    IMS TV Turbo
 		    AVer Media TV/FM
-		Hardware monitoring sensors, including: [G]
+		Hardware monitoring sensors, including:
 		    National Semiconductor LM78, LM78-J, LM79
 		    Winbond W83697HF, W83627HF, W83627THF, W83781D, W83782D
 		    VIA VT82C686A, VT8231
@@ -724,12 +696,6 @@ Supported hardware {:-include-:}:
 		Most serial port or modem cards
 		NE2100 Ethernet cards
 
-Drivers for hardware marked with [G] are only included in the GENERIC
-kernels, but are NOT included on the various distribution floppies
-(including the cd-rom boot image).
-Drivers for hardware marked with [A] are not included in floppy A.
-Drivers for hardware marked with [B] are not included in floppy B.
-Drivers for hardware marked with [C] are not included in floppy C.
 Support for devices marked with [*] is not included in the GENERIC kernel,
 and will require you to compile a custom kernel to enable it.
 
diff --git a/distrib/notes/amd64/install b/distrib/notes/amd64/install
index 6a2df1a1113..79786f6e06e 100644
--- a/distrib/notes/amd64/install
+++ b/distrib/notes/amd64/install
@@ -1,9 +1,9 @@
-dnl	$OpenBSD: install,v 1.1 2004/02/07 21:29:10 deraadt Exp $
+dnl	$OpenBSD: install,v 1.2 2004/02/07 22:47:49 miod Exp $
 OpenBSDInstallPrelude
 
-If OpenBSD will be sharing the disk with DOS or another operating
-system, you should have already completed the section of these notes
-that instructed you on how to prepare your hard disk.  You should know
+If OpenBSD will be sharing the disk with another operating system,
+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
@@ -13,35 +13,52 @@ that use the translated geometry.
 
 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
-off the bootable CD-ROM mini image.  Otherwise, you can boot from a 3.5"
-1.44MB floppy disk if your machine has a floppy drive.
+off the bootable CD-ROM mini image.
+dnl Otherwise, you can boot from a 3.5"
+dnl 1.44MB floppy disk if your machine has a floppy drive.
 
 OpenBSDInstallPart2
 
-	With either the CD-ROM or the floppy in the drive, reboot your
-	computer. You might have to play with your BIOS options to let the
-	computer boot from the installation media, rather than the hard
-	disk.
-
-	It will take a while to load the kernel from a floppy or slow
-	speed CD-ROM drive, most likely more than a minute.  If some
-	action doesn't eventually happen, or the spinning cursor has
-	stopped and nothing further has happened, either your boot floppy
-	is bad or you are having hardware problems. If trying another
-	floppy disk doesn't help, try booting after disabling your CPU's
-	internal and external caches (if any).  If it still doesn't work,
-	OpenBSD probably can't be run on your hardware.  This can probably
-	be considered a bug, so you might want to report it.
-	If you do, please {:-include-:} as many details about your system
-	configuration as you can.
-
+dnl	With either the CD-ROM or the floppy in the drive, reboot your
+dnl	computer. You might have to play with your BIOS options to let the
+dnl	computer boot from the installation media, rather than the hard
+dnl	disk.
+	With the CD-ROM in the drive, reboot your computer. You might
+	have to play with your BIOS options to let the computer boot
+	from the installation media, rather than the hard disk.
+
+dnl	It will take a while to load the kernel from a floppy or slow
+dnl	speed CD-ROM drive, most likely more than a minute.  If some
+dnl	action doesn't eventually happen, or the spinning cursor has
+dnl	stopped and nothing further has happened, either your boot floppy
+dnl	is bad or you are having hardware problems. If trying another
+dnl	floppy disk doesn't help, try booting after disabling your CPU's
+dnl	internal and external caches (if any).  If it still doesn't work,
+dnl	OpenBSD probably can't be run on your hardware.  This can probably
+dnl	be considered a bug, so you might want to report it.
+dnl	If you do, please {:-include-:} as many details about your system
+dnl	configuration as you can.
+dnl
 
 OpenBSDBootMsgs
 
 	You will next be asked for your terminal type.  You should just
 	hit return to select the default (vt220).
 
-OpenBSDInstallPart3({:- or "wd0" for IDE/RLL/ESDI/ST506 drives-:})
+dnl Replace the following paragraph...
+dnl with this:
+	After entering the terminal type you will be asked whether you
+        wish to do an "(I)nstall".  Enter 'I' for a fresh install.
+
+	You will be presented with a welcome message and asked if
+        you really wish to install.  Assuming you answered yes, the
+	install program will then tell you which disks of that type
+	it can install on, and ask you which it should use.
+	The name of the disk is typically "sd0" for SCSI drives or
+	"wd0" for IDE/RLL/ESDI/ST506 drives.
+        Reply with the name of your disk.
+dnl OpenBSDInstallPart3({:- or "wd0" for IDE/RLL/ESDI/ST506 drives-:})
+dnl once upgrades are available
 
 	Next you will have to edit or create a disk label for the disk
 	OpenBSD is being installed on.  If there are any existing
diff --git a/distrib/notes/amd64/prep b/distrib/notes/amd64/prep
index 8f017bdc943..e261983ab6a 100644
--- a/distrib/notes/amd64/prep
+++ b/distrib/notes/amd64/prep
@@ -1,10 +1,10 @@
-NOTE: If you wish to install OpenBSD on your whole disk, i.e. you do
-not want DOS or any other operating system to reside on your hard
-disk, you can skip this section and go on to the section that
-describes installation, below.  If you're upgrading your system from a
-previous release of OpenBSD, you should have proceeded directly to the
-section about upgrading; you need none of the information presented
-here.
+dnl	$OpenBSD: prep,v 1.2 2004/02/07 22:47:49 miod Exp $
+NOTE: If you wish to install OpenBSD on your whole disk, i.e. you do not
+want any other operating system to reside on your hard disk, you can skip
+this section and go on to the section that describes installation, below.
+dnl If you're upgrading your system from a previous release of OpenBSD, you
+dnl should have proceeded directly to the section about upgrading; you need
+dnl none of the information presented here.
 
 First and foremost, before beginning the installation process, MAKE
 SURE YOU HAVE A RELIABLE BACKUP of any data on your hard disk that you
@@ -12,34 +12,36 @@ wish to keep.  Repartitioning your hard disk is an excellent way to
 destroy important data.
 
 Second, if you are using a disk controller which supports disk geometry
-translation, be sure to use the same parameters for OpenBSD as for DOS
-or the other operating systems installed on your disk.  If you do not,
-it will be much harder to make OpenBSD properly coexist with them.
-Utilities exist which will print out the disk geometry which DOS sees;
-some versions of DOS "fdisk" also do this.  If you have an "EIDE" hard
-disk, DOS and OpenBSD probably won't see the same geometry, and you must
-be careful to find out the DOS geometry and tell OpenBSD about it during
-the installation.
+translation, be sure to use the same parameters for OpenBSD as for the
+other operating systems installed on your disk.  If you do not, it will
+be much harder to make OpenBSD properly coexist with them.
+dnl
+dnl All this text below is probably completely unapplicable to amd64,
+dnl as they don't have BIOS that old and crappy...
+dnl
+dnl Utilities exist which will print out the disk geometry which DOS sees;
+dnl some versions of DOS "fdisk" also do this.  If you have an "EIDE" hard
+dnl disk, DOS and OpenBSD probably won't see the same geometry, and you must
+dnl be careful to find out the DOS geometry and tell OpenBSD about it during
+dnl the installation.
+dnl
+dnl Third (but related to the second point above), if you are using a hard
+dnl disk with more sectors than DOS or your controller's BIOS supports without
+dnl some kind of software translation utility or other kludge, you MUST
+dnl BE SURE that all partitions which you want to boot from must start and end
+dnl below cylinder 1024 by the BIOS's idea of the disk, and that all DOS
+dnl partitions MUST EXIST ENTIRELY BELOW cylinder 1024, or you will either not
+dnl be able to boot OpenBSD, not be able to boot DOS, or you may experience
+dnl data loss or filesystem corruption.  Be sure you aren't using geometry
+dnl translation that you don't know about, but that the DOS "fdisk" program
+dnl does!
+dnl
+dnl The OpenBSD root partition must also reside completely within the BIOS
+dnl supported part of the hard disk -- this would typically be 504M, 2G or 8G,
+dnl depending upon the age of the machine and its BIOS.
 
-Third (but related to the second point above), if you are using a hard
-disk with more sectors than DOS or your controller's BIOS supports without
-some kind of software translation utility or other kludge, you MUST
-BE SURE that all partitions which you want to boot from must start and end
-below cylinder 1024 by the BIOS's idea of the disk, and that all DOS
-partitions MUST EXIST ENTIRELY BELOW cylinder 1024, or you will either not
-be able to boot OpenBSD, not be able to boot DOS, or you may experience
-data loss or filesystem corruption.  Be sure you aren't using geometry
-translation that you don't know about, but that the DOS "fdisk" program
-does!
-
-The OpenBSD root partition must also reside completely within the BIOS
-supported part of the hard disk -- this would typically be 504M, 2G or 8G,
-depending upon the age of the machine and its BIOS.  Due to a limit of the
-OpenBSD boot loader, the root partition must be within the first 8G even if
-the BIOS supports more.  Note that only the root partition has this issue,
-once OpenBSD is loaded, the entire disk is available for use.
-
-Fourth, use the other operating system's "fdisk" program or partition
+dnl Fourth, use the other operating system's "fdisk" program or partition
+Third, use the other operating system's "fdisk" program or partition
 editor to create at least one of the partitions to be used for that
 operating system.  If that operating system is already set up to use the
 entire disk, you will have to back it up, remove and recreate a smaller
@@ -49,20 +51,20 @@ ation will give you an opportunity to create the partition needed for
 OpenBSD.
 
 Finally, do whatever is necessary to restore order to the partition
-you took space away from.  If it was a DOS partition, you probably
-will need to use "format" to create a new file system on it, and then
-restore your important files from your backups.  Other operating
-systems will have different needs; most will need to reformat the
-partition, and if it was their "main" partition, will probably need
+you took space away from. Most operating systems will need to reformat
+the partition, and if it was their "main" partition, will probably need
 to be reinstalled.
 
-Once you've backed all your data up, there is a tool called fips 2.0
-that can shrink your FAT-based DOS/Windows partition to make room for
-OpenBSD.  It is included in the MACHINE tools area of this distribution as
-a convenience.  It is strongly advised that you read its documentation
-and understand the consequences of your actions before using it.  In some
-cases, defragmenting your disk and running fips may be much faster than
-reinstalling your DOS partition from the backup.
-
+dnl
+dnl Don't advertize fips on amd64.
+dnl
+dnl Once you've backed all your data up, there is a tool called fips 2.0
+dnl that can shrink your FAT-based DOS/Windows partition to make room for
+dnl OpenBSD.  It is included in the MACHINE tools area of this distribution as
+dnl a convenience.  It is strongly advised that you read its documentation
+dnl and understand the consequences of your actions before using it.  In some
+dnl cases, defragmenting your disk and running fips may be much faster than
+dnl reinstalling your DOS partition from the backup.
+dnl
 Your hard disk is now prepared to have OpenBSD installed on it, and
 you should proceed with the installation instructions.
diff --git a/distrib/notes/amd64/upgrade b/distrib/notes/amd64/upgrade
index 48e2b2689c4..5dfba36776e 100644
--- a/distrib/notes/amd64/upgrade
+++ b/distrib/notes/amd64/upgrade
@@ -1,103 +1,5 @@
-dnl	$OpenBSD: upgrade,v 1.1 2004/02/07 21:29:10 deraadt Exp $
+dnl	$OpenBSD: upgrade,v 1.2 2004/02/07 22:47:49 miod Exp $
+Since OpenBSD/OSREV is the first MACHINE release, there is no upgrade
+functionnality.
 dnl OpenBSDUpgrade({:-the CD-ROM or an installation floppy as you would do for
 dnl a new installation-:})
-Due to the change from a.out to ELF binary format in OpenBSD OSREV,
-upgrades can be a complex, delicate process. The best solution, whenever
-possible, is to backup your data and reinstall from scratch.
-
-The second best solution is to remove all ports, third party programs and
-libraries installed on your system; upgrade; and then add ELF versions of
-the removed files.
-
-In all cases, once you start the upgrade you MUST complete it. If the
-upgrade process fails or is abandoned before it completes you will almost
-certainly be left with a non-functional system.
-
-Finally, you cannot use the bsd.rd kernel to upgrade the system. The
-existing bootblocks on your system cannot boot the OSREV bsd.rd.
-
-If you must do an upgrade while preserving the functionality of any
-existing a.out binary files, then the rest of this section will guide you
-through that process.
-
-The two main hurdles in upgrading from an a.out system to an ELF OpenBSD
-OSREV system while preserving the functioning of a.out binaries are:
-- the a.out binary emulation, required for compatibility with a.out
-  binaries using shared libraries, is not enabled by default, and requires
-  an explicit configuration change.
-- a.out shared libraries (lib*.so) need to be moved to a specific location
-  for proper operation of older binaries.
-
-Before you start the upgrade process, the a.out emulation area needs to be
-set up. It needs to be put inside a /emul/a.out hierarchy. This directory can,
-however, be a symbolic link, should the available space in the root partition
-not be enough.
-
-It is recommended that the following instructions and commands are issued in
-single-user mode.
-
-The /emul/a.out hierarchy should be populated by the a.out shared libraries.
-An easy way to do it is to run the following commands as root:
-
-   mkdir -p /emul/a.out/var/run
-   tar cf - /sbin/ldconfig /usr/bin/ldd /usr/libexec/ld.so |
-       tar -C /emul/a.out -xpf -
-   for lib in $(/sbin/ldconfig -r |
-     awk '/=>/ { print $3 }');
-   do
-     dirname $lib;
-   done | sort -u > /root/a.out-libdirs
-   tar cf - $(find $(< /root/a.out-libdirs) -name "lib*.so.*") |
-       tar -C /emul/a.out -xpf -
-
-Then, a cache of these shared libraries must be generated with:
-
-   cp /var/run/ld.so.hints /var/run/ld.so.hints.backup
-   /sbin/ldconfig -s $(/usr/bin/sed 's,^/,/emul/a.out/,' /root/a.out-libdirs) 
-   /bin/mv /var/run/ld.so.hints /emul/a.out/var/run
-   /bin/mv /var/run/ld.so.hints.backups /var/run/ld.so.hints
-
-The last step before the upgrade is to enable the a.out emulation, in
-order to be sure that /etc/rc.local or any other customization you have
-made to the system will still run:
-
-  echo "kern.emul.aout=1" >> /etc/sysctl.conf
-
-
-ATTENTION! Several configuration files under /etc, such as /etc/login.conf,
-will refer to existing a.out binaries. DO NOT UPGRADE YOUR SYSTEM UNLESS
-YOU HAVE ENABLED A.OUT EMULATION FIRST! After you merge configuration files
-changes and replace or remove your existing a.out binaries, it will be
-possible to disable a.out emulation.
-
-
-The upgrade is now possible. Boot from the CD-ROM or an installation
-floppy, as you would do for a new installation. 
-
-When prompted, select the (U)pgrade option rather than the (I)nstall
-option at the prompt in the install process.
-
-The upgrade script will ask you for the existing root partition, and
-will use the existing filesystems defined in /etc/fstab to install the
-new system in. It will also use your existing network parameters.
-
-From then, the upgrade procedure is very close to the installation
-procedure described earlier in this document. Note that the upgrade
-procedure will not let you pick the ``etc{:--:}OSrev.tgz'' set, so as to
-preserve your files in `/etc' which you are likely to have customized
-since a previous installation.
-
-When the upgrade procedure tells you that the upgrade is complete, do not
-reboot the system yet.
-
-However, it is strongly advised that you unpack the etc{:--:}OSrev.tgz set in
-a temporary directory and merge changes by hand, since all components of
-your system may not function correctly until your files in `/etc' are
-updated.
-
-After the upgrade is completed, it is now possible to remove the old a.out
-shared libraries from their initial locations:
-
-  rm -f $(file $(find $(< /root/a.out-libdirs) -name "lib*.so.*") |
-    awk -F: '/demand paged/ { print $1 }')
-  rm -f /root/a.out-libdirs
diff --git a/distrib/notes/amd64/whatis b/distrib/notes/amd64/whatis
index 15bbdcc830c..e524ab23ddb 100644
--- a/distrib/notes/amd64/whatis
+++ b/distrib/notes/amd64/whatis
@@ -1,5 +1,2 @@
-dnl	$OpenBSD: whatis,v 1.1 2004/02/07 21:29:10 deraadt Exp $
-For the MACHINE, OpenBSD OSREV brings greater stability and security,
-including a stricter memory permission scheme. As a side effect of the
-full security audit, many userland programs have been significantly
-cleaned up and debugged.
+dnl	$OpenBSD: whatis,v 1.2 2004/02/07 22:47:49 miod Exp $
+OpenBSD/MACHINE is a new port to the AMD Athlon 64 family of computers.
diff --git a/distrib/notes/amd64/xfer b/distrib/notes/amd64/xfer
index 9432057b87f..54daf02f99d 100644
--- a/distrib/notes/amd64/xfer
+++ b/distrib/notes/amd64/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.1 2004/02/07 21:29:10 deraadt Exp $
+dnl	$OpenBSD: xfer,v 1.2 2004/02/07 22:47:49 miod Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
@@ -10,19 +10,20 @@ dnl	Remote NFS partition
 	FTP
 	HTTP
 
-If you can't (or don't want to) boot off a CD-ROM, you'll need to have
-a floppy disk (1.44MB required).
-
-OpenBSDXferFloppyFromDOS
-
-OpenBSDXferFloppyFromUNIX
-
+dnl Uncomment when floppies are available
+dnl If you can't (or don't want to) boot off a CD-ROM, you'll need to have
+dnl a floppy disk (1.44MB required).
+dnl
+dnl OpenBSDXferFloppyFromDOS
+dnl
+dnl OpenBSDXferFloppyFromUNIX
+dnl
 
 OpenBSDXferShortPrelude
 
 
 OpenBSDXferBareTape(xbase xfont xlink xserv xshare)
 
-dnl OpenBSDXferNFS
+dnl OpenBSDXferNFS(noupgrade)
 dnl
-OpenBSDXferFFS
+OpenBSDXferFFS(noupgrade)