cvs commit: apache-1.3/htdocs/manual/misc FAQ.html

[coar]

coar        99/02/16 07:11:31

  Modified:    htdocs/manual/misc FAQ.html
  Log:
        Add the licence question to the FAQ..
  
  Revision  Changes    Path
  1.140     +15 -1     apache-1.3/htdocs/manual/misc/FAQ.html
  
  Index: FAQ.html
  ===================================================================
  RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/FAQ.html,v
  retrieving revision 1.139
  retrieving revision 1.140
  diff -u -r1.139 -r1.140
  --- FAQ.html  1999/02/14 01:03:18     1.139
  +++ FAQ.html  1999/02/16 15:11:30     1.140
  @@ -14,7 +14,7 @@
     <!--#include virtual="header.html" -->
     <H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1>
     <P>
  -  $Revision: 1.139 $ ($Date: 1999/02/14 01:03:18 $)
  +  $Revision: 1.140 $ ($Date: 1999/02/16 15:11:30 $)
     </P>
     <P>
     The latest version of this FAQ is always available from the main
  @@ -302,6 +302,9 @@
      </LI>
      <LI><A HREF="#apspam">Why am I getting spam mail from the Apache site?</A>
      </LI>
  +   <LI><A HREF="#redist">May I include the Apache software on a CD or other
  +        package I'm distributing?</A>
  +   </LI>
     </OL>
    </LI>
   </UL>
  @@ -2389,6 +2392,17 @@
      No marketing spam originates from the Apache site.  The only mail
      that comes from the site goes only to addresses that have been
      <EM>requested</EM> to receive the mail.
  +   </P>
  +   <HR>
  +  </LI>
  +  <LI><A NAME="redist"><STRONG>May I include the Apache software on a
  +       CD or other package I'm distributing?</STRONG></A>
  +   <P>
  +   The detailed answer to this question can be found in the
  +   Apache license, which is included in the Apache distribution in
  +   the file <CODE>LICENSE</CODE>.  You can also find it on the Web at
  +   <SAMP>&lt;<A HREF="http://www.apache.org/LICENSE.txt";
  +             >http://www.apache.org/LICENSE.txt</A>&gt;</SAMP>.
      </P>
      <HR>
     </LI>