===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/i386.html,v
retrieving revision 1.592
retrieving revision 1.593
diff -u -r1.592 -r1.593
--- www/i386.html	2006/12/08 01:06:37	1.592
+++ www/i386.html	2006/12/08 10:29:43	1.593
@@ -997,119 +997,6 @@
 <li>Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11a/b/g PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ipw&amp;arch=i386&amp;sektion=4">ipw</a>) <sup>(G)</sup>
 <li>Intel PRO/Wireless 2200BG/2225BG/2915ABG 802.11a/b/g PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=iwi&amp;arch=i386&amp;sektion=4">iwi</a>) <sup>(G)</sup>
 <li>Intel PRO/Wireless 3945ABG IEEE 802.11a/b/g PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wpi&amp;arch=i386&amp;sektion=4">wpi</a>) <sup>(G)</sup>
-<li>Intersil PRISM-2-3 based 802.11b Compact Flash adapters (will be detected as PCMCIA adapters) (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;arch=i386&amp;sektion=4">wi</a>) <sup>(A) (B)</sup> 
-    <ul>
-    <li>AmbiCom WL1100C-CF
-    <li>ASUS WL-110
-    <li>Belkin F5D6060
-    <li>Buffalo AirStation
-    <li>D-Link DCF-660W
-    <li>ELSA XI800
-    <li>Linksys WCF12
-    <li>Netgear MA701
-    <li>Pretec Compact WLAN OC-WLBXX-A
-    <li>Senao NL-2511CF
-    </ul>
-<li>Intersil PRISM 2-3, Lucent Hermes and Symbol Spectrum 24 based PCMCIA 802.11b adapters
-(<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;arch=i386&amp;sektion=4">wi</a>), including: <sup>(A) (B)</sup>
-    <ul>
-    <li>3Com AirConnect 3CRWE737A
-    <li>ACTIONTEC HWC01170
-    <li>Addtron AWP-100
-    <li>Agere Orinoco
-    <li>ARtem Onair
-    <li>BUFFALO AirStation
-    <li>Cabletron RoamAbout
-    <li>Compaq Agency NC5004
-    <li>Contec FLEXLAN/FX-DS110-PCC
-    <li>Corega PCC-11
-    <li>Corega PCCA-11
-    <li>Corega PCCB-11
-    <li>Corega CGWLPCIA11
-    <li>Dlink DWL650 revisions A1-J3
-    <li>ELSA XI300
-    <li>ELSA XI325
-    <li>ELSA XI325H
-    <li>EMTAC A2424i
-    <li>Ericsson Wireless LAN CARD C11
-    <li>Gemtek WL-311
-    <li>Hawking Technology WE110P
-    <li>I-O DATA WN-B11/PCM
-    <li>Intel PRO/Wireless 2011
-    <li>Intersil Prism II
-    <li>Linksys Instant Wireless WPC11
-    <li>Linksys Instant Wireless WPC11 2.5
-    <li>Linksys Instant Wireless WPC11 3.0
-    <li>Lucent WaveLAN
-    <li>NANOSPEED ROOT-RZ2000
-    <li>NEC CMZ-RT-WP
-    <li>Netgear MA401
-    <li>Netgear MA401RA
-    <li>Nokia C020 Wireless LAN
-    <li>Nokia C110/C111 Wireless LAN
-    <li>NTT-ME 11Mbps Wireless LAN
-    <li>Planex GW-NS11H Wireless LAN
-    <li>Proxim Harmony
-    <li>Proxim RangeLAN-DS
-    <li>Samsung MagicLAN SWL-2000N
-    <li>SMC 2632 EZ Connect
-    <li>Symbol Spectrum24
-    <li>TDK LAK-CD011WL
-    <li>US Robotics 2410
-    <li>US Robotics 2445
-    </ul>
-<li>Intersil PRISM 2-3 and Symbol Spectrum24 based PCI 802.11b adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;arch=i386&amp;sektion=4">wi</a>), including: <sup>(A) (B)</sup>
-    <ul>
-    <li>3Com AirConnect 3CRWE777A PCI
-    <li>Belkin F5D6000 PCI (a rebadged WL11000P)
-    <li>Corega CGWLPCIA11 PCI
-    <li>Eumitcom WL11000P PCI
-    <li>Dlink DWL520 PCI revisions A and B
-    <li>Global Sun Technology GL24110P PCI (untested)
-    <li>Global Sun Technology GL24110P02 PCI
-    <li>Intersil Mini-PCI
-    <li>Linksys WDT11 PCI (a rebadged GL24110P02)
-    <li>NDC/Sohoware NCP130 PCI
-    <li>Netgear MA301 PCI
-    <li>Netgear MA311 PCI
-    <li>US Robotics 2415 PCI (rebadged WL11000P)
-    <li>Nortel E-mobility 211818-A
-    <li>Symbol LA4123
-    </ul>
-<li>Intersil PRISM 2.5/3 based USB 802.11b adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=atu&amp;arch=i386&amp;sektion=4">wi</a>), including: <sup>(A) (B)</sup>
-    <ul>
-    <li>Acer Warplink USB-400
-    <li>Actiontec HWU01170
-    <li>AirVast WM168b
-    <li>Ambit WLAN
-    <li>Apacer Wireless Steno MB112
-    <li>ASUS WL-140
-    <li>Compaq W100
-    <li>Corega WLUSB-11
-    <li>Corega WLUSB-11 Key
-    <li>D-Link DWL-120 (rev F)
-    <li>D-Link DWL-122
-    <li>I-O DATA WN-B11/USB
-    <li>Intel PRO/Wireless 2011B
-    <li>Intersil Prism 2X
-    <li>JVC MP-XP7250
-    <li>Linksys WUSB11 v3.0
-    <li>Linksys WUSB12
-    <li>Melco WLI-USB-KB11
-    <li>Melco WLI-USB-KS11G
-    <li>Melco WLI-USB-S11
-    <li>Microsoft MN510
-    <li>Netgear MA111 (version 1 only)
-    <li>Pheenet WL-503IA
-    <li>Planex GW-US11H
-    <li>Siemens SpeedStream SS1022
-    <li>Sitecom WL-022
-    <li>Syntax USB-400
-    <li>US Robotics 1120
-    <li>Z-Com XI-725/726
-    <li>Z-Com XI-735
-    <li>ZyXEL ZyAIR B-200
-    </ul>
 <li>Marvell Libertas IEEE 802.11b/g CardBus adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=malo&amp;arch=i386&amp;sektion=4">malo</a>), including: <sup>(G)</sup>
     <ul>
     <li>Netgear WG511v2
@@ -1334,6 +1221,122 @@
     <li>USR USR5416
     <li>Zyxel G-360 EE
     </ul>
+<li>WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b Compact Flash adapters (will be detected as PCMCIA adapters) (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;arch=i386&amp;sektion=4">wi</a>), including: <sup>(B)</sup>
+    <ul>
+    <li>AmbiCom WL1100C-CF
+    <li>ASUS SpaceLink WL-110
+    <li>Belkin F5D6060 (version 1 only)
+    <li>Buffalo AirStation
+    <li>D-Link DCF-660W
+    <li>ELSA XI800
+    <li>Linksys WCF12
+    <li>Netgear MA701
+    <li>Pretec Compact WLAN OC-WLBXX-A
+    <li>Senao NL-2511CF
+    </ul>
+<li>WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b PCI adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;arch=i386&amp;sektion=4">wi</a>), including: <sup>(C)</sup>
+    <ul>
+    <li>3Com AirConnect 3CRWE777A
+    <li>Addtron AWA-100
+    <li>Belkin F5D6001 (version 1 only)
+    <li>Corega CGWLPCIA11
+    <li>D-Link DWL-520 (rev A and B only)
+    <li>Intersil Mini PCI
+    <li>Intersil ISL3872
+    <li>Longshine 8301
+    <li>NDC/Sohoware NCP130
+    <li>Netgear MA311
+    <li>Nortel E-mobility 211818-A
+    <li>Samsung MagicLAN SWL-2210P
+    <li>Senao NL-2511MP
+    <li>Symbol LA4123
+    </ul>
+<li>WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b PCMCIA adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;arch=i386&amp;sektion=4">wi</a>), including: <sup>(B)</sup>
+    <ul>
+    <li>3Com AirConnect 3CRWE737A
+    <li>Actiontec HWC01170
+    <li>Adaptec AWN-8030
+    <li>Addtron AWP-100
+    <li>Agere ORiNOCO
+    <li>ARtem Onair
+    <li>ASUS SpaceLink WL-100
+    <li>Belkin F5D6020 (version 1 only)
+    <li>Buffalo AirStation
+    <li>Cabletron RoamAbout
+    <li>Compaq Agency NC5004
+    <li>Contec FLEXLAN/FX-DS110-PCC
+    <li>Corega PCC-11
+    <li>Corega PCCA-11
+    <li>Corega PCCB-11
+    <li>D-Link DWL-650 (rev A1-J3 only)
+    <li>ELSA XI300
+    <li>ELSA XI325
+    <li>ELSA XI325H
+    <li>EMTAC A2424i
+    <li>Ericsson Wireless LAN CARD C11
+    <li>Gemtek WL-311
+    <li>Hawking Technology WE110P
+    <li>I-O DATA WN-B11/PCM
+    <li>Intel PRO/Wireless 2011
+    <li>Intersil Prism II
+    <li>Linksys Instant Wireless WPC11
+    <li>Linksys Instant Wireless WPC11 2.5
+    <li>Linksys Instant Wireless WPC11 3.0
+    <li>Lucent WaveLAN
+    <li>Microsoft MN520
+    <li>NANOSPEED ROOT-RZ2000
+    <li>NEC CMZ-RT-WP
+    <li>Netgear MA401
+    <li>Netgear MA401RA
+    <li>Nokia C020 Wireless LAN
+    <li>Nokia C110/C111 Wireless LAN
+    <li>NTT-ME 11Mbps Wireless LAN
+    <li>Planex GW-NS11H
+    <li>Proxim Harmony
+    <li>Proxim RangeLAN-DS
+    <li>Samsung MagicLAN SWL-2000N
+    <li>Siemens SpeedStream SS1021
+    <li>SMC 2632 EZ Connect
+    <li>Symbol Spectrum24
+    <li>TDK LAK-CD011WL
+    <li>US Robotics 2410
+    <li>US Robotics 2445
+    </ul>
+<li>WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b USB adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&amp;arch=i386&amp;sektion=4">wi</a>), including: <sup>(A) (B)</sup>
+    <ul>
+    <li>Acer Warplink USB-400
+    <li>Actiontec HWU01170
+    <li>AirVast WM168b
+    <li>Ambit WLAN
+    <li>Apacer Wireless Steno MB112
+    <li>ASUS WL-140
+    <li>Compaq W100
+    <li>Corega WLUSB-11
+    <li>Corega WLUSB-11 Key
+    <li>D-Link DWL-120 (rev F)
+    <li>D-Link DWL-122
+    <li>I-O DATA WN-B11/USB
+    <li>Intel PRO/Wireless 2011B
+    <li>Intersil Prism 2X
+    <li>JVC MP-XP7250
+    <li>Linksys WUSB11 v3.0
+    <li>Linksys WUSB12
+    <li>Melco WLI-USB-KB11
+    <li>Melco WLI-USB-KS11G
+    <li>Melco WLI-USB-S11
+    <li>Microsoft MN510
+    <li>Netgear MA111 (version 1 only)
+    <li>Pheenet WL-503IA
+    <li>Planex GW-US11H
+    <li>Siemens SpeedStream SS1022
+    <li>Sitecom WL-022
+    <li>Syntax USB-400
+    <li>US Robotics 1120
+    <li>ViewSonic Airsync
+    <li>Z-Com XI-725/726
+    <li>Z-Com XI-735
+    <li>ZyXEL ZyAIR B-200
+    </ul>
 <li>ZyDAS ZD1211/ZD1211B USB IEEE 802.11b/g USB adapters (<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=zyd&amp;arch=i386&amp;sektion=4">zyd</a>) <sup>(G)</sup>
     <ul>
     <li>3COM 3CRUSB10075
@@ -2067,7 +2070,7 @@
 <br>
 <small><a href="mailto:www@openbsd.org">www@openbsd.org</a></small>
 <br>
-<small>$OpenBSD: i386.html,v 1.592 2006/12/08 01:06:37 jmc Exp $</small>
+<small>$OpenBSD: i386.html,v 1.593 2006/12/08 10:29:43 jmc Exp $</small>
 
 </body>
 </html>