===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/i386.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- www/i386.html	1997/06/12 03:36:37	1.35
+++ www/i386.html	1997/06/12 14:16:27	1.36
@@ -92,6 +92,7 @@
   <li> Adaptec AHA-154xA, -B, -C, and -CF
   <li> Adaptec AHA-174x
   <li> 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.)
+  <li> Adaptec AIC-7770-based SCSI host adapters (including the Adaptec AHA-274x, AHA-284x families).
   <li> Adaptec AHA-294x[W] cards and some onboard PCI designs using the AIC7870 chip.  This driver does *not* currently work with non-PCI AIC-7xxx boards or the Adaptec 3940.
   <li> Buslogic 54x (Adaptec AHA-154x clones; driver on kcadp floppy)
   <li> BusLogic 445, 74x, 9xx  (But not the new "FlashPoint" series of BusLogic SCSI adapters)
@@ -216,13 +217,12 @@
 <ul>
 <li> "Micro Channel" MCA bus used in many IBM PS/2 models.
 <li> APM power management -- if your system supports it, turn it off!
-<li> Adaptec AIC-7770-based SCSI host adapters (including the Adaptec AHA-274x, AHA-284x families).
 <li> NCR 5380-based SCSI host adapters.
 <li> QIC-40 and QIC-80 tape drives.  (Those are the tape drives that connect to the floppy disk controller.)
 <li> WD-7000 SCSI host adapters.
 <li> PCI-PCI bridges and cards which include them, such as the AHA-394x SCSI host adapter and some DC21x4x-based multi-Ethernet cards.
 <li> Multiprocessor Pentium and Pentium Pro systems.  (Though they should run fine using one processor only.)
-<li> Intel EtherExpress 100 Fast Ethernet adapters.
+<li> Intel EtherExpress 100 Fast Ethernet adapters. (can be merged in soon)
 </ul>
 </p>
 
@@ -234,7 +234,7 @@
 <a href=plat.html><img src=back.gif border=0 alt=OpenBSD></a> 
 <a href=mailto:www@openbsd.org>www@openbsd.org</a>
 <br>
-<small>$OpenBSD: i386.html,v 1.35 1997/06/12 03:36:37 johns Exp $</small>
+<small>$OpenBSD: i386.html,v 1.36 1997/06/12 14:16:27 johns Exp $</small>
 
 </body>
 </html>