You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@locus.apache.org on 2000/09/12 17:53:52 UTC
cvs commit: httpd-docs-1.3/htdocs/manual/misc FAQ-A.html FAQ-I.html
coar 00/09/12 08:53:49
Modified: htdocs/manual/misc FAQ-A.html FAQ-I.html
Log:
More FAQs..
Revision Changes Path
1.5 +25 -1 httpd-docs-1.3/htdocs/manual/misc/FAQ-A.html
Index: FAQ-A.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/misc/FAQ-A.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- FAQ-A.html 2000/04/04 16:51:06 1.4
+++ FAQ-A.html 2000/09/12 15:53:48 1.5
@@ -31,7 +31,7 @@
<!--#include virtual="header.html" -->
<H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1>
<P>
- $Revision: 1.4 $ ($Date: 2000/04/04 16:51:06 $)
+ $Revision: 1.5 $ ($Date: 2000/09/12 15:53:48 $)
</P>
<P>
The latest version of this FAQ is always available from the main
@@ -86,6 +86,8 @@
</LI>
<LI><A HREF="#where">Where can I get Apache?</A>
</LI>
+ <li><a href="#logo">May I use the Apache logo on my product or Web site?</a>
+ </li>
</OL>
</LI>
<!--#endif -->
@@ -310,6 +312,28 @@
</P>
<HR>
</LI>
+
+ <li><a name="logo">
+ <b>May I use the Apache logo on my product or Web site?</b></a>
+ <p>
+ You may <b>NOT</b> use any original artwork from the Apache Software
+ Foundation, nor make or use modified versions of such artwork, except
+ under the following conditions:
+ </p>
+ <ul>
+ <li>You may use the
+ <a href="../../apache_pb.gif">'Powered by Apache' graphic</a>
+ on a Web site that is being served by the Apache HTTP server software.</li>
+ <li>You may use the aforementioned 'Powered by Apache' graphic or the
+ <a href="http://www.apache.org/foundation/images/asf_logo.gif"
+ >Apache Software Foundation logo</a> in product description and
+ promotional material <b>IF and ONLY IF</b> such use can in no way
+ be interpreted as anything other than an attribution. Using the
+ Apache name and artwork in a manner that implies endorsement of a
+ product or service is <b>strictly forbidden</b>.</li>
+ </ul>
+ <hr>
+ </li>
</OL>
<!--#endif -->
<!--#if expr="$STANDALONE" -->
1.10 +13 -1 httpd-docs-1.3/htdocs/manual/misc/FAQ-I.html
Index: FAQ-I.html
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/misc/FAQ-I.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- FAQ-I.html 2000/08/24 15:52:00 1.9
+++ FAQ-I.html 2000/09/12 15:53:48 1.10
@@ -31,7 +31,7 @@
<!--#include virtual="header.html" -->
<H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1>
<P>
- $Revision: 1.9 $ ($Date: 2000/08/24 15:52:00 $)
+ $Revision: 1.10 $ ($Date: 2000/09/12 15:53:48 $)
</P>
<P>
The latest version of this FAQ is always available from the main
@@ -92,6 +92,7 @@
</li>
<li><a href="#asp">Can I use Active Server Pages (ASP) with Apache?</a>
</li>
+ <li><a href="#java">Does Apache come with Java support?</a></li>
</OL>
</LI>
<!--#endif -->
@@ -274,6 +275,17 @@
add this functionality; see the
<a href="http://www.apache.org/related_projects.html"
>related projects</a> page to find out more.
+ </p>
+ <hr>
+ </li>
+
+ <li><a name="java"><b>Does Apache come with Java support?</b></a>
+ <p>
+ The base Apache Web server package does not include support for
+ Java, Java Server Pages, Enterprise Java Beans, or Java servlets.
+ Those features are available as add-ons from the Apache/Java project
+ site, <URL:<a href="http://jakarta.apache.org"
+ >http://jakarta.apache.org/<a/>>.
</p>
<hr>
</li>