===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/amd64.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- www/amd64.html	2004/03/19 11:49:23	1.11
+++ www/amd64.html	2004/03/20 18:14:23	1.12
@@ -67,10 +67,10 @@
 <a name="hardware"></a>
 <h3><font color="#0000e0"><strong>Supported hardware:</strong></font></h3>
 
-<p>
+<!-- <p>
 The list of supported hardware is relevant to OpenBSD-current. It will
 differ slightly from the support provided in the latest release version.
-</p>
+</p> -->
 
 <p>
 <h4>Processors</h4>
@@ -108,7 +108,9 @@
 <p>
 <ul>
   <li>Standard PCI-PCI bridges, including PCI expansion backplanes (<i>ppb</i>)
+<!-- 
   <li>YENTA-compatible PCI-CardBus bridges (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=cbb&amp;sektion=4">cbb</a>)
+ -->
 </ul>
 </p>
 
@@ -162,36 +164,29 @@
 
 <p>
 <ul>
-<li>Adaptec AIC-6260 and AIC-6360 based boards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=aic&amp;sektion=4">aic</a>), including the
-    Adaptec AHA-152x and the SoundBlaster SCSI host adapter. <sup>(B)</sup><br>
-    (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).
 <li>Adaptec AIC-7770-based SCSI host adapters (including the
-    Adaptec AHA-274x and AHA-284x families). (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ahc&amp;sektion=4">ahc</a>) <sup>(B) (C)</sup>
+    Adaptec AHA-274x and AHA-284x families). (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ahc&amp;sektion=4">ahc</a>)
 <li>Adaptec AHA-[23]94x[W] cards and some on-board PCI designs using the
-    AIC7870 and AIC7880 chips. (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ahc&amp;sektion=4">ahc</a>) <sup>(B) (C)</sup>
+    AIC7870 and AIC7880 chips. (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ahc&amp;sektion=4">ahc</a>)
 <li>Adaptec AHA-[23]94xU[2W] cards and on-board PCI designs using the
-    AIC789[01], AIC7895, AIC789[67] chips. (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ahc&amp;sektion=4">ahc</a>) <sup>(B) (C)</sup>
+    AIC789[01], AIC7895, AIC789[67] chips. (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ahc&amp;sektion=4">ahc</a>)
 <li>Adaptec AIC-789[29] chips and products like the AHA-29160 based upon it
-    which do 160MB/sec SCSI. (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ahc&amp;sektion=4">ahc</a>) <sup>(B) (C)</sup>
+    which do 160MB/sec SCSI. (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ahc&amp;sektion=4">ahc</a>)
     (However, the 7899G card is currently not supported with more than one device attached)
 <li>AdvanSys "U", "UW", "U2W" and "U160" PCI SCSI controllers including the
-    ABP940U[AW], ASB3940U[AW]-00, ASB3940U2W-00 and ASB3950U160. (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=adw&amp;sektion=4">adw</a>) <sup>(A) (C)</sup> and <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=adv&amp;sektion=4">adv</a> <sup>(B) (C)</sup>)
-<li>AMD Am53c974 PCscsi-PCI SCSI controllers (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pcscp&amp;sektion=4">pcscp</a>), including: <sup>(A) (B) (C)</sup>
+    ABP940U[AW], ASB3940U[AW]-00, ASB3940U2W-00 and ASB3950U160. (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=adw&amp;sektion=4">adw</a>) and <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=adv&amp;sektion=4">adv</a>)
+<li>AMD Am53c974 PCscsi-PCI SCSI controllers (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pcscp&amp;sektion=4">pcscp</a>), including:
     <ul>
     <li>Tekram DC-390
     </ul>
-<li>Buslogic BT-54x (Adaptec AHA-154x clones) (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=aha&amp;sektion=4">aha</a>) <sup>(B) (C)</sup>
-<li>BusLogic 445, 74x, 9xx (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=bha&amp;sektion=4">bha</a>) (but not the new "FlashPoint" series
-    of BusLogic SCSI adapters) <sup>(B) (C)</sup>
-<li>Initio INIC-940 and INIC-950 based PCI SCSI host adapters including the Initio INI-9090U and INI-9100U/UW, Iwill 2935UW, and DTC Domex 3194U Plus. (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=iha&amp;sektion=4">iha</a>) <sup>(A) (C)</sup>
-<li>QLogic PCI SCSI controllers (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=isp&amp;sektion=4">isp</a>) <sup>(A) (C)</sup>
+<li>BusLogic 9xx (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=bha&amp;sektion=4">bha</a>) (but not the new "FlashPoint" series
+    of BusLogic SCSI adapters)
+<li>Initio INIC-940 and INIC-950 based PCI SCSI host adapters including the Initio INI-9090U and INI-9100U/UW, Iwill 2935UW, and DTC Domex 3194U Plus. (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=iha&amp;sektion=4">iha</a>)
+<li>QLogic PCI SCSI controllers (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=isp&amp;sektion=4">isp</a>)
 <li>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.) (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=siop&amp;sektion=4">siop</a>) <sup>(B) (C)</sup>
-<li>Tekram DC-300B and DC-320E (Adaptec AHA-154x clones) (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=aha&amp;sektion=4">aha</a>) <sup>(B) (C)</sup>
-<li>Tekram DC-315U and DC-395U/UW/F TRM-S1040 based PCI SCSI host adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=trm&amp;sektion=4">trm</a>) <sup>(A) (C)</sup>
+    Diamond Fireport series, etc.) (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=siop&amp;sektion=4">siop</a>)
+<li>Tekram DC-315U and DC-395U/UW/F TRM-S1040 based PCI SCSI host adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=trm&amp;sektion=4">trm</a>)
 </ul>
 </p>
 
@@ -201,15 +196,15 @@
 
 <p>
 <ul>
-<li>3ware Escalade 3W-5x00 and 3W-6x00 series (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=twe&amp;sektion=4">twe</a>) <sup>(A) (C)</sup>
-<li>Adaptec FSA-based RAID controllers (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=aac&amp;sektion=4">aac</a>), including: <sup>(A) (C)</sup>
+<li>3ware Escalade 3W-5x00 and 3W-6x00 series (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=twe&amp;sektion=4">twe</a>)
+<li>Adaptec FSA-based RAID controllers (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=aac&amp;sektion=4">aac</a>), including:
     <ul>
     <li>Adaptec AAC-2622, AAC-364, AAC-3642
     <li>Dell PERC 2/Si, PERC 2/QC, PERC 3/Si, PERC 3/Di, PERC 3/QC
     <li>HP NetRAID-4M
     </ul>
-<li>American Megatrends Inc. MegaRAID controllers in &quot;Mass Storage&quot; mode (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ami&amp;sektion=4">ami</a>)<sup>(A) (C)</sup>
-<li>Compaq Smart ARRAY RAID controllers (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=cac&amp;sektion=4">cac</a>), including: <sup>(A) (C)</sup>
+<li>American Megatrends Inc. MegaRAID controllers in &quot;Mass Storage&quot; mode (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ami&amp;sektion=4">ami</a>)
+<li>Compaq Smart ARRAY RAID controllers (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=cac&amp;sektion=4">cac</a>), including:
     <ul>
     <li>Compaq Integrated Array
     <li>Compaq IAES
@@ -218,9 +213,9 @@
     <li>Compaq Smart Array 221, 3100ES, 3200, 4200, 4250ES, 431
     <li>Compaq SMART, SMART-2/E, SMART-2/P, SMART-2DH, SMART-2SL
     </ul>
-<li>DPT SmartCache and SmartRaid III/IV PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=dpt&amp;sektion=4">dpt</a>) <sup>(A) (C)</sup>
-<li>Intel (and formerly ICP-Vortex) GDT series (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=gdt&amp;sektion=4">gdt</a>) <sup>(A) (C)</sup>
-<li><a href="http://www.intelligent-io.com/">I2O</a> adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=iop&amp;sektion=4">iop</a>), including: <sup>(A) (C)</sup>
+<li>DPT SmartCache and SmartRaid III/IV PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=dpt&amp;sektion=4">dpt</a>)
+<li>Intel (and formerly ICP-Vortex) GDT series (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=gdt&amp;sektion=4">gdt</a>)
+<li><a href="http://www.intelligent-io.com/">I2O</a> adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=iop&amp;sektion=4">iop</a>), including:
     <ul>
     <li>Adaptec SCSI RAID (ASR-2100S, ASR-2110S, ASR-3200S, etc.)
     <li>Adaptec ATA RAID (AAR-2400A)
@@ -249,7 +244,7 @@
 <p>
 <ul>
 <li>Most SCSI tape drives (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=st&amp;sektion=4">st</a>)
-<li>Most SCSI tape changers (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ch&amp;sektion=4">ch</a>) <sup>(G)</sup>
+<li>Most SCSI tape changers (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ch&amp;sektion=4">ch</a>)
 </ul>
 </p>
 
@@ -278,9 +273,9 @@
 <li>16550-based ports (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=com&amp;sektion=4">com</a>)
 <li>ST16650-based ports (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=com&amp;sektion=4">com</a>)
 <li>XR16850-based ports (only in the <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pccom&amp;sektion=4">pccom</a> driver)
-<li>AST-style 4-port serial boards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ast&amp;sektion=4">ast</a>) <sup>(G)</sup>
-<li>Cyclades Cyclom-{4, 8, 16}Y serial boards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=cy&amp;sektion=4">cy</a>) <sup>(G)</sup>
-<li>Cyclades-Z series multiport serial boards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=cz&amp;sektion=4">cz</a>) <sup>(G)</sup>
+<li>AST-style 4-port serial boards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ast&amp;sektion=4">ast</a>)
+<li>Cyclades Cyclom-{4, 8, 16}Y serial boards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=cy&amp;sektion=4">cy</a>)
+<li>Cyclades-Z series multiport serial boards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=cz&amp;sektion=4">cz</a>)
 </ul>
 </p>
 
@@ -292,10 +287,10 @@
 <ul>
 <li>Universal Serial Bus host controllers, including:
     <ul>
-    <li>USB Universal Host Controller (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=uhci&amp;sektion=4">uhci</a>) <sup>(A) (B) (C)</sup>
-    <li>USB Open Host Controller (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ohci&amp;sektion=4">ohci</a>) <sup>(A) (B) (C)</sup>
+    <li>USB Universal Host Controller (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=uhci&amp;sektion=4">uhci</a>)
+    <li>USB Open Host Controller (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ohci&amp;sektion=4">ohci</a>)
     </ul>
-<li>PCI "universal" communication cards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=puc&amp;sektion=4">puc</a>), providing serial (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=com&amp;sektion=4">com</a>) and parallel (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=lpt&amp;apropos=0&amp;sektion=4&amp;manpath=OpenBSD+Current&amp;arch=amd64&amp;format=html">lpt</a>) children, including: <sup>(G)</sup>
+<li>PCI "universal" communication cards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=puc&amp;sektion=4">puc</a>), providing serial (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=com&amp;sektion=4">com</a>) and parallel (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=lpt&amp;apropos=0&amp;sektion=4&amp;manpath=OpenBSD+Current&amp;arch=amd64&amp;format=html">lpt</a>) children, including:
     <ul>
     <li>Dolphin Peripherals 4014 (dual parallel) and 4035 (dual serial)
     <li>SIIG Cyber 2P1S (dual parallel, single serial) and 2S1P (dual serial, single parallel) PCI
@@ -348,7 +343,6 @@
 
 <p>
 <ul>
-<li>3Com 3c509, 3c579, and 3c59x (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ep&amp;sektion=4">ep</a>) (disabling PnP on 3c509B is recommended)
 <li>3Com 3c9xx EtherLink XL adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=xl&amp;sektion=4">xl</a>), including:
     <ul>
     <li>3Com 3c900/3c900B PCI adapters
@@ -364,7 +358,7 @@
     <li>NVidia nForce2 integrated 3Com 9201 (nForce2-ST, nForce2-GT)
     </ul>
 
-<li>3Com 3c990 3XP Typhoon/Sidewinder PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=txp&amp;sektion=4">txp</a>), including: <sup>(A) (B) (C)</sup>
+<li>3Com 3c990 3XP Typhoon/Sidewinder PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=txp&amp;sektion=4">txp</a>), including:
     <ul>
     <li>3CR990-TX-95
     <li>3CR990-TX-97
@@ -372,7 +366,7 @@
     <li>3CR990-SVR97
     </ul>
 
-<li>Adaptec "Starfire" AIC-6915 based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sf&amp;sektion=4">sf</a>), including: <sup>(G)</sup>
+<li>Adaptec "Starfire" AIC-6915 based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sf&amp;sektion=4">sf</a>), including:
     <ul>
     <li>Adaptec Single32 ANA-69011
     <li>Adaptec Single64 ANA-62011 and ANA-62020
@@ -387,7 +381,7 @@
     <li>Mototech ME316
     </ul>
 
-<li>ADMtek AN986-based USB adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=aue&amp;apropos=0&amp;sektion=4&amp;manpath=OpenBSD+Current&amp;arch=amd64&amp;format=html">aue</a>), including: <sup>(A) (B) (C)</sup>
+<li>ADMtek AN986-based USB adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=aue&amp;apropos=0&amp;sektion=4&amp;manpath=OpenBSD+Current&amp;arch=amd64&amp;format=html">aue</a>), including:
     <ul>
     <li>Abocom UFE1000
     <li>Abocom DSB650TX
@@ -416,7 +410,7 @@
     <li>SOHOware NUB100
     </ul>
 
-<li>AMD PCnet-based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=le&amp;apropos=0&amp;sektion=4&amp;manpath=OpenBSD+Current&amp;arch=amd64&amp;format=html">le</a>), including: <sup>(B) (C)</sup>
+<li>AMD PCnet-based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=le&amp;apropos=0&amp;sektion=4&amp;manpath=OpenBSD+Current&amp;arch=amd64&amp;format=html">le</a>), including:
     <ul>
     <li>BOCALANcard/PCI
     <li>AT&amp;T StarLAN 10, EN100, and StarLAN Fiber
@@ -428,7 +422,7 @@
     <li>Alfa Inc. GFC2204
     </ul>
 
-<li>CATC USB-EL1210A-based USB adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=cue&amp;sektion=4">cue</a>), including: <sup>(G)</sup>
+<li>CATC USB-EL1210A-based USB adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=cue&amp;sektion=4">cue</a>), including:
     <ul>
     <li>CATC Netmate and Netmate II
     <li>Belkin F5U111
@@ -470,7 +464,7 @@
 
 <li>Intel 21145-based cards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=dc&amp;sektion=4">dc</a>)
 
-<li>Kawasaki LSI KL5KUSB101B-based USB adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=kue&amp;sektion=4">kue</a>), including: <sup>(A) (B) (C)</sup>
+<li>Kawasaki LSI KL5KUSB101B-based USB adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=kue&amp;sektion=4">kue</a>), including:
     <ul>
     <li>3Com 3C19250
     <li>3Com 3c460 HomeConnect
@@ -508,13 +502,13 @@
 
 <li>Myson Technologies MTD803 3-in-1 Fast Ethernet adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=mtd&amp;sektion=4">mtd</a>)
 
-<li>National Semiconductor DP83815-based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sis&amp;sektion=4">sis</a>), including: <sup>(B) (C)</sup>
+<li>National Semiconductor DP83815-based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sis&amp;sektion=4">sis</a>), including:
     <ul>
     <li>NetGear FA311
     <li>NetGear FA312
     </ul>
 
-<li>Novell NE1000, NE2000 (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ne&amp;sektion=4">ne</a>) <sup>(B)</sup>
+<li>Novell NE1000, NE2000 (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ne&amp;sektion=4">ne</a>)
 
 <li>RealTek 8129/8139-based adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=rl&amp;sektion=4">rl</a>), including:
     <ul>
@@ -533,31 +527,31 @@
     <li>SMC EZ Card 10/100 PCI 1211-TX
     </ul>
 
-<li>Realtek RTL8150L based USB adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=url&amp;sektion=4">url</a>), including: <sup>(G)</sup>
+<li>Realtek RTL8150L based USB adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=url&amp;sektion=4">url</a>), including:
     <ul>
     <li>Melco Inc. LUA-KTX
     <li>GreenHouse GH-USB100B
     <li>Linksys USB100M
     </ul>
 
-<li>SiS 900 and SiS 7016-based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sis&amp;sektion=4">sis</a>), including: <sup>(B) (C)</sup>
+<li>SiS 900 and SiS 7016-based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sis&amp;sektion=4">sis</a>), including:
     <ul>
     <li>Mototech ME313
     <li>NetSurf NS-KFE30D
     </ul>
 
-<li>Sun Happy Meal PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=hme&amp;sektion=4">hme</a>), including: <sup>(G)</sup>
+<li>Sun Happy Meal PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=hme&amp;sektion=4">hme</a>), including:
     <ul>
     <li>Fast Ethernet
     <li>Quad Fast Ethernet
     </ul>
 
-<li>Sundance ST201-based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ste&amp;sektion=4">ste</a>), including: <sup>(G)</sup>
+<li>Sundance ST201-based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ste&amp;sektion=4">ste</a>), including:
     <ul>
     <li>D-Link DFE-550TX
     </ul>
 
-<li>Texas Instruments ThunderLAN PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=tl&amp;sektion=4">tl</a>), including: <sup>(C)</sup>
+<li>Texas Instruments ThunderLAN PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=tl&amp;sektion=4">tl</a>), including:
     <ul>
     <li>Compaq Netelligent PCI Adapters
     <li>Compaq NetFlex 3/P
@@ -568,14 +562,14 @@
     <li>TI ThunderLAN adapters
     </ul>
 
-<li>VIA Rhine/RhineII/RhineIII Ethernet adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=vr&amp;sektion=4">vr</a>), including: <sup>(C)</sup>
+<li>VIA Rhine/RhineII/RhineIII Ethernet adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=vr&amp;sektion=4">vr</a>), including:
     <ul>
     <li>Addtron AEF-360TX
     <li>Hawking PN102TX
     <li>D-Link DFE530TX
     </ul>
 
-<li>Winbond W89C840F-based adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wb&amp;sektion=4">wb</a>), including: <sup>(A)</sup>
+<li>Winbond W89C840F-based adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wb&amp;sektion=4">wb</a>), including:
     <ul>
     <li>Trendware TE100-PCIE
     <li>Compex RL100-ATX 10/100
@@ -593,57 +587,57 @@
 <ul>
 <li>Compact Flash Adapters (will be detected as PCMCIA adapters)
     <ul>
-    <li>Buffalo AirStation CF (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>ELSA XI800 CF (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
+    <li>Buffalo AirStation CF (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>ELSA XI800 CF (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
     </ul>
 <!--
 <li>PCMCIA Adapters
     <ul>
-    <li>3Com AirConnect 3CRWE737A PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>ACTIONTEC HWC01170 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Addtron AWP-100 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Agere Orinoco PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Aironet 4500/4800 802.11DS PCMCIA and PCI (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=an&amp;sektion=4">an</a>) <sup>(A) (B)</sup>
-    <li>BUFFALO AirStation PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Cabletron RoamAbout PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Cisco 340/350 802.11DS PCMCIA and PCI (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=an&amp;sektion=4">an</a>) <sup>(A) (B)</sup>
-    <li>Compaq Agency NC5004 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Contec FLEXLAN/FX-DS110-PCC PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Corega PCC-11 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Corega PCCA-11 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Corega PCCB-11 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Corega CGWLPCIA11 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Dlink DWL650 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>ELSA XI300 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>ELSA XI325 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>ELSA XI325H PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>EMTAC A2424i PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Ericsson Wireless LAN CARD C11 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Gemtek WL-311 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Hawking Technology WE110P PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>I-O DATA WN-B11/PCM PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Intel PRO/Wireless 2011 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Intersil Prism II PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Linksys Instant Wireless WPC11 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Linksys Instant Wireless WPC11 2.5 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Linksys Instant Wireless WPC11 3.0 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Lucent WaveLAN PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>NANOSPEED ROOT-RZ2000 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>NEC CMZ-RT-WP PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Netgear MA401 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Netgear MA401RA PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Nokia C020 Wireless LAN PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Nokia C110/C111 Wireless LAN PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>NTT-ME 11Mbps Wireless LAN PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Proxim Harmony PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Proxim RangeLAN-DS PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>RayLink Aviator2.4/Pro 802.11FH PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ray&amp;sektion=4">ray</a>) <sup>(A) (B)</sup>
-    <li>Samsung MagicLAN SWL-2000N PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>SMC 2632 EZ Connect PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>Symbol Spectrum24 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>TDK LAK-CD011WL PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>US Robotics 2410 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
-    <li>US Robotics 2445 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>) <sup>(A) (B) (C)</sup>
+    <li>3Com AirConnect 3CRWE737A PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>ACTIONTEC HWC01170 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Addtron AWP-100 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Agere Orinoco PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Aironet 4500/4800 802.11DS PCMCIA and PCI (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=an&amp;sektion=4">an</a>)
+    <li>BUFFALO AirStation PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Cabletron RoamAbout PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Cisco 340/350 802.11DS PCMCIA and PCI (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=an&amp;sektion=4">an</a>)
+    <li>Compaq Agency NC5004 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Contec FLEXLAN/FX-DS110-PCC PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Corega PCC-11 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Corega PCCA-11 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Corega PCCB-11 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Corega CGWLPCIA11 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Dlink DWL650 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>ELSA XI300 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>ELSA XI325 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>ELSA XI325H PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>EMTAC A2424i PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Ericsson Wireless LAN CARD C11 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Gemtek WL-311 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Hawking Technology WE110P PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>I-O DATA WN-B11/PCM PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Intel PRO/Wireless 2011 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Intersil Prism II PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Linksys Instant Wireless WPC11 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Linksys Instant Wireless WPC11 2.5 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Linksys Instant Wireless WPC11 3.0 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Lucent WaveLAN PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>NANOSPEED ROOT-RZ2000 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>NEC CMZ-RT-WP PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Netgear MA401 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Netgear MA401RA PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Nokia C020 Wireless LAN PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Nokia C110/C111 Wireless LAN PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>NTT-ME 11Mbps Wireless LAN PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Proxim Harmony PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Proxim RangeLAN-DS PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>RayLink Aviator2.4/Pro 802.11FH PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ray&amp;sektion=4">ray</a>)
+    <li>Samsung MagicLAN SWL-2000N PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>SMC 2632 EZ Connect PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>Symbol Spectrum24 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>TDK LAK-CD011WL PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>US Robotics 2410 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
+    <li>US Robotics 2445 PCMCIA (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;sektion=4">wi</a>)
     </ul>
 -->
 <li>PCI Adapters
@@ -669,7 +663,7 @@
 
 <p>
 <ul>
-<li>Alteon Tigon I/II-based adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ti&amp;sektion=4">ti</a>), including: <sup>(A) (B) (C)</sup>
+<li>Alteon Tigon I/II-based adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ti&amp;sektion=4">ti</a>), including:
     <ul>
     <li>3Com 3c985 and 3c985B
     <li>Alteon ACEnic V (fiber and copper)
@@ -698,7 +692,7 @@
     <li> Intel PRO/1000MF Server Adapter (LX Fiber) (PWLA8490LX)
     </ul>
 
-<li>National Semiconductor DP83820 and DP83821 based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=nge&amp;sektion=4">nge</a>), including: <sup>(A) (B) (C)</sup>
+<li>National Semiconductor DP83820 and DP83821 based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=nge&amp;sektion=4">nge</a>), including:
     <ul>
     <li>Addtron AEG320T
     <li>Ark PC SOHO-GA2500T (32-bit PCI) and SOHO-GA2000T (64-bit PCI)
@@ -712,14 +706,14 @@
     <li>Trendware TEG-PCITX (32-bit PCI) and TEG-PCITX2 (64-bit PCI)
     </ul>
 
-<li>Level1 LXT1001 based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=lge&amp;sektion=4">lge</a>), including: <sup>(*)</sup>
+<li>Level1 LXT1001 based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=lge&amp;sektion=4">lge</a>), including:
 <br><i>This driver is currently untested.  Feedback would be appreciated.</i>
     <ul>
     <li>SMC TigerCard 1000 (SMC9462SX)
     <li>D-Link DGE-500SX
     </ul>
 
-<li>Broadcom BCM570x (a.k.a. Tigon3) based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=bge&amp;sektion=4">bge</a>), including: <sup>(A) (B) (C)</sup>
+<li>Broadcom BCM570x (a.k.a. Tigon3) based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=bge&amp;sektion=4">bge</a>), including:
     <ul>
     <li>3Com 3c996-T (10/100/1000baseTX)
     <li>3Com 3c996-SX (1000baseSX)
@@ -729,13 +723,13 @@
     <li>SysKonnect SK-9D41 (1000baseSX)
     </ul>
 
-<li>Sundance/Tamarack TC9021 based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=stge&amp;sektion=4">stge</a>), including: <sup>(G)</sup>
+<li>Sundance/Tamarack TC9021 based PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=stge&amp;sektion=4">stge</a>), including:
     <ul>
     <li>D-Link DGE-550T (10/100/1000baseTX)
     <li>Antares Microsystems Gigabit Ethernet board
     </ul>
 
-<li>SysKonnect and Marvell based GigE(<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sk&amp;sektion=4">sk</a>), including: <sup>(A) (B) (C)</sup>
+<li>SysKonnect and Marvell based GigE(<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sk&amp;sektion=4">sk</a>), including:
     <ul>
     <li>SysKonnect SK-9821 (1000baseT)
     <li>SysKonnect SK-9822 (dual 1000baseT)
@@ -761,7 +755,7 @@
 
 <p>
 <ul>
-<li>Efficient Networks EN-155 and Adaptec ANA-590x ATM interfaces (<i>en</i>) <sup>(*)</sup>
+<li>Efficient Networks EN-155 and Adaptec ANA-590x ATM interfaces (<i>en</i>)
 </ul>
 </p>
 
@@ -771,7 +765,7 @@
 
 <p>
 <ul>
-<li>Digital DEFPA PCI FDDI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=fpa&amp;sektion=4">fpa</a>) <sup>(G)</sup>
+<li>Digital DEFPA PCI FDDI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=fpa&amp;sektion=4">fpa</a>)
 </ul>
 </p>
 
@@ -781,7 +775,7 @@
 
 <p>
 <ul>
-<li>Lan Media Corporation SSI (T1)/HSSI/DS1/DS3 WAN interfaces (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=lmc&amp;sektion=4">lmc</a>) <sup>(G)</sup>
+<li>Lan Media Corporation SSI (T1)/HSSI/DS1/DS3 WAN interfaces (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=lmc&amp;sektion=4">lmc</a>)
 </ul>
 </p>
 
@@ -791,9 +785,9 @@
 
 <p>
 <ul>
-<li>Broadcom uBsec BCM5801, BCM5802, BCM5805, BCM5820, BCM5821, BCM5822, BCM5823 (and the legacy Bluesteelnet 5501 and 5601 parts)(<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ubsec&amp;sektion=4">ubsec</a>) <sup>(G)</sup>
-<li>Hifn 6500-based boards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=lofn&amp;sektion=4">lofn</a>) <sup>(G)</sup>
-<li>Hifn 7751/7811/7951/7955/7956-based boards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=hifn&amp;sektion=4">hifn</a>), including: <sup>(G)</sup>
+<li>Broadcom uBsec BCM5801, BCM5802, BCM5805, BCM5820, BCM5821, BCM5822, BCM5823 (and the legacy Bluesteelnet 5501 and 5601 parts)(<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ubsec&amp;sektion=4">ubsec</a>)
+<li>Hifn 6500-based boards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=lofn&amp;sektion=4">lofn</a>)
+<li>Hifn 7751/7811/7951/7955/7956-based boards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=hifn&amp;sektion=4">hifn</a>), including:
     <ul>
     <li>Soekris Engineering vpn1201, vpn1211, vpn1401, and vpn1411
     <li>GTGI PowerCrypt Encryption Accelerator
@@ -808,7 +802,7 @@
 <!--
 <p>
 <a name="pcmcia"></a>
-<h4>PC Cards (PCMCIA <sup>(B)</sup> and CardBus <sup>(B) (C)</sup>)</h4>
+<h4>PC Cards (PCMCIA and CardBus)</h4>
 </p>
 
 <p>
@@ -899,16 +893,16 @@
 	<ul>
 	<li>Accton MPX5030 CardBus
 	<li>Corega FEther CB-TXD 10/100 Ethernet
-	<li>D-Link DFE-690TXD <sup><font color="#0000e0">*</font></sup>
+	<li>D-Link DFE-690TXD
 	</ul>
 
-    <li>SMC 91Cxx-based (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sm&amp;sektion=4">sm</a>), including: <sup>(G)</sup>
+    <li>SMC 91Cxx-based (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sm&amp;sektion=4">sm</a>), including:
 	<ul>
 	<li>Megahertz XJEM1144, CC10BT
 	<li>SMC EtherEZ 8020BT
 	</ul>
 
-    <li>Xircom (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=xe&amp;sektion=4">xe</a>), including: <sup>(A)</sup>
+    <li>Xircom (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=xe&amp;sektion=4">xe</a>), including:
 	<ul>
 	<li>Xircom CreditCard CE2
 	</ul>
@@ -939,33 +933,33 @@
 -->
 
 <p>
-<h4>Universal Serial Bus (USB) Devices <sup>(A) (B) (C)</sup></h4>
+<h4>Universal Serial Bus (USB) Devices</h4>
 </p>
 
 <p>
 <ul>
-<li>USB Audio (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=uaudio&amp;sektion=4">uaudio</a>) <sup>(G)</sup>
-<li>USB Diamond MultiMedia Rio MP3 players (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=urio&amp;sektion=4">urio</a>) <sup>(G)</sup>
+<li>USB Audio (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=uaudio&amp;sektion=4">uaudio</a>)
+<li>USB Diamond MultiMedia Rio MP3 players (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=urio&amp;sektion=4">urio</a>)
 <li>USB Ethernet adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=aue&amp;sektion=4">aue</a>,
 			   <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=cue&amp;sektion=4">cue</a>,
 			   <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=kue&amp;sektion=4">kue</a>),
-			see above <sup>(G)</sup>
-<li>USB Generic Human Interface Devices (catch-all) (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=uhid&amp;sektion=4">uhid</a>) <sup>(G)</sup>
-<li>USB Handspring Visor (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=uvisor&amp;sektion=4">uvisor</a>) <sup>(G)</sup>
+			see above
+<li>USB Generic Human Interface Devices (catch-all) (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=uhid&amp;sektion=4">uhid</a>)
+<li>USB Handspring Visor (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=uvisor&amp;sektion=4">uvisor</a>)
 <li>USB Hubs (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=uhub&amp;sektion=4">uhub</a>)
 <li>USB Keyboards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ukbd&amp;sektion=4">ukbd</a>)
 <li>USB Mass Storage devices, i.e., USB floppy drives and USB memory stick controllers (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=umass&amp;sektion=4">umass</a>)
-<li>USB Mice (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ums&amp;sektion=4">ums</a>) <sup>(G)</sup>
-<li>USB Modems (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=umodem&amp;sektion=4">umodem</a>) <sup>(G)</sup>
-<li>USB Printers (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ulpt&amp;sektion=4">ulpt</a>) <sup>(G)</sup>
-<li>USB Scanners (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=uscanner&amp;sektion=4">uscanner</a>, <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=usscanner&amp;sektion=4">usscanner</a>) <sup>(G)</sup>
-<li>USB-USB cables (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=upl&amp;sektion=4">upl</a>) <sup>(G)</sup>
-<li>USB Y@p phone (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=uyap&amp;sektion=4">uyap</a>) <sup>(*)</sup>
+<li>USB Mice (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ums&amp;sektion=4">ums</a>)
+<li>USB Modems (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=umodem&amp;sektion=4">umodem</a>)
+<li>USB Printers (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ulpt&amp;sektion=4">ulpt</a>)
+<li>USB Scanners (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=uscanner&amp;sektion=4">uscanner</a>, <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=usscanner&amp;sektion=4">usscanner</a>)
+<li>USB-USB cables (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=upl&amp;sektion=4">upl</a>)
+<li>USB Y@p phone (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=uyap&amp;sektion=4">uyap</a>)
 </ul>
 </p>
 
 <p>
-<h4>Pointing Devices <sup>(G)</sup></h4>
+<h4>Pointing Devices</h4>
 </p>
 
 <p>
@@ -976,7 +970,7 @@
 </p>
 
 <p>
-<h4>Sound Devices <sup>(G)</sup></h4>
+<h4>Sound Devices</h4>
 </p>
 
 <p>
@@ -995,15 +989,13 @@
 <li>SoundBlaster Live! and PCI512 (EMU10k1) (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=emu&amp;sektion=4">emu</a>)
 <li>Trident 4DWave-DX/NX and clones (SiS 7018, ALi M5451) (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=autri&amp;sektion=4">autri</a>)
 <li>VIA VT82C686A, VT8233, VT8235, VT8237 SouthBridge integrated AC'97 audio (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=auvia&amp;sektion=4">auvia</a>)
-<li>Yamaha OPL3-SA3 (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ym&amp;sektion=4">ym</a>)
 <li>Yamaha DS-XG (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=yds&amp;sektion=4">yds</a>)
 </ul>
 </p>
 
 <p>
-The following drivers are not extensively tested:
+The following driver has not been extensively tested:
 <ul>
-<li>ProAudio Spectrum (<i>pas</i>)
 <li>S3 SonicVibes (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sv&amp;sektion=4">sv</a>)
 </ul>
 </p>
@@ -1025,7 +1017,7 @@
 
 <p>
 <ul>
-<li>Brooktree 848/849/878/879-based video capture cards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=bktr&amp;sektion=4">bktr</a>), including: <sup>(G)</sup>
+<li>Brooktree 848/849/878/879-based video capture cards (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=bktr&amp;sektion=4">bktr</a>), including:
     <ul>
     <li>AverMedia cards
     <li>Hauppauge Wincast TV and WinTV/PCI
@@ -1034,7 +1026,7 @@
     <li>Miro PC TV
     <li>STB TV PCI Television Tuner
     </ul>
-<li>Hardware monitoring sensors, including: <sup>(G)</sup>
+<li>Hardware monitoring sensors, including:
     <ul>
     <li>National Semiconductor LM78, LM78-J, LM79;
 	Winbond W83697HF, W83627HF, W83627THF, W83781D, W83782D (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=lm&amp;sektion=4">lm</a>)
@@ -1073,7 +1065,7 @@
   <a href="http://www.openbsd.org/cgi-bin/cvsweb/src/sys/arch/amd64/conf/RAMDISK_CD?rev=HEAD">RAMDISK_CD</a>
   kernel configuration file.
   </p></li>
-  <li><strong>Floppy A</strong> (floppy34.fs)
+  <li><strong>Floppy A</strong> (floppy35.fs)
   <p>
   This 1.44MB floppy image contains the most common drivers.
   It is designed to cover the most typical PC. As a general rule, you will
@@ -1092,7 +1084,7 @@
 <br>
 <small><a href="mailto:www@openbsd.org">www@openbsd.org</a></small>
 <br>
-<small>$OpenBSD: amd64.html,v 1.11 2004/03/19 11:49:23 saad Exp $</small>
+<small>$OpenBSD: amd64.html,v 1.12 2004/03/20 18:14:23 miod Exp $</small>
 
 </body>
 </html>