summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/manual/misc/FAQ.html16
1 files changed, 15 insertions, 1 deletions
diff --git a/docs/manual/misc/FAQ.html b/docs/manual/misc/FAQ.html
index 47f6220cf5..f8074c6cd1 100644
--- a/docs/manual/misc/FAQ.html
+++ b/docs/manual/misc/FAQ.html
@@ -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>
@@ -2392,6 +2395,17 @@
</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>
<!-- Don't forget to add HR tags at the end of each list item.. -->
</OL>