2 files changed, 15 insertions, 6 deletions

diff --git a/share/FAQ/FreeBSD.FAQ b/share/FAQ/FreeBSD.FAQ
index de29fdcb26d4..448992106102 100644
--- a/share/FAQ/FreeBSD.FAQ
+++ b/share/FAQ/FreeBSD.FAQ
@@ -6,7 +6,7 @@
 Please mail all suggestions and additions to <FreeBSD-FAQ@FreeBSD.ORG>
 
 
-Revision: $Id: FreeBSD.FAQ,v 1.5 1994/10/09 01:14:51 pst Exp $
+Revision: $Id: FreeBSD.FAQ,v 1.6 1994/10/10 10:39:09 gclarkii Exp $
 
 All entries are assumed to be relevant to FreeBSD 2.0. 
 Any entries with a <XXX> are under construction.
@@ -245,6 +245,7 @@ FreeBSD supports the following SCSI controllers:
 Adaptec              AH-154x Series <ISA>
                      AH-174x Series <EISA>
                      AH-152x Series <ISA>
+		     AH-2742/2842 Series <ISA/EISA>
 Buslogic             BT-445 Series <VLB> (but see section 1.5)
                      BT-545 Series <ISA>
                      BT-742 Series <EISA>
@@ -283,11 +284,18 @@ Check the sio(4) man page to get more information on configuring such
 cards.
 
 
-2.5:  Does FreeBSD support the AHA-2742 SCSI adapter from Adaptec?
+2.5:  Does FreeBSD support the AHA-2742/2842 SCSI adapters from Adaptec?
 
-No, FreeBSD does not.  This is due to Adaptec's unwillingness to
-supply programming information under other than non-disclosure.  This
-is unfortunate, but there's nothing we can do about it.
+Yes, though portions of the sources are currently GPL'd (that is to say,
+distributed under the GNU Public License), so be aware of the fact should
+you wish to distribute kernel binaries compiled with it - you MUST also
+provide the sources to the driver with the kernel image to stay legal
+with the GPL!  This is easily enough done by simply including the contents
+of /usr/src/sys/gnu/{aic7770,misc} on whatever media you distribute the
+kernel.
+
+We are working to get the GPL restriction removed, but for now you should
+at least be aware of it.
 
  
 2.6:  I have a Mumbleco bus mouse.  Is it supported and if so, how do I set
diff --git a/share/FAQ/RELNOTES.FreeBSD b/share/FAQ/RELNOTES.FreeBSD
index 5bceff716e32..f78f2e14f4f4 100644
--- a/share/FAQ/RELNOTES.FreeBSD
+++ b/share/FAQ/RELNOTES.FreeBSD
@@ -269,6 +269,7 @@ extended features are used.]
 Adaptec 152x series ISA SCSI controllers
 Adaptec 154x series ISA SCSI controllers
 Adaptec 174x series EISA SCSI controller in standard and enhanced mode.
+Adaptec 2742/2842 series ISA/EISA SCSI controllers
 
 [Note that Buslogic was formerly known as "Bustec"]
 Buslogic 545S & 545c
@@ -514,4 +515,4 @@ hope you enjoy this release of FreeBSD!
 
 			The FreeBSD Core Team
 
-$Id: RELNOTES.FreeBSD,v 1.12 1994/11/14 23:52:42 jkh Exp $
+$Id: RELNOTES.FreeBSD,v 1.13 1994/11/17 12:35:22 jkh Exp $