From: André Malo <nd@apache.org>
Date: Mon, 19 Sep 2005 16:04:34 +0000 (+0000)
Subject: backport docs/manual/faq/background.xml from trunk
X-Git-Tag: 2.1.8~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=647dc1720fd0915e540e16959568b6134a4ba7dd;p=thirdparty%2Fapache%2Fhttpd.git

backport docs/manual/faq/background.xml from trunk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290193 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/faq/background.xml b/docs/manual/faq/background.xml
index 066d60efc3f..e79a54889fd 100644
--- a/docs/manual/faq/background.xml
+++ b/docs/manual/faq/background.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE faq SYSTEM "../style/faq.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- $LastChangedRevision: 151408 $ -->
+<!-- $LastChangedRevision: 240301 $ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ Copyright 2005 The Apache Software Foundation or its licensors, as
  applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,6 +24,8 @@
 <parentdocument href="./">FAQ</parentdocument>
 
 <title>Background - Frequently Asked Questions</title>
+<description>Background information about the Apache HTTP Server.</description>
+
 <section id="background"><title>Background</title>
 
     <ul>
@@ -39,41 +41,58 @@
     <section id="background.what-is-apache">
       <title>What is Apache?</title>
 
-      <p>The Apache Software Foundation (ASF) is a 501(c)3 non-profit 
-      organization, originating from the development of the Apache HTTPD 
-      Server.  For details on the history of the ASF, please see the 
-      <a href="">Foundation FAQ</a></p>
-	</section>
+      <p>The Apache Software Foundation (ASF) is a 501(c)3 non-profit
+      organization providing support for the Apache community of
+      open-sourced software projects.  For more details, please see the <a
+      href="http://www.apache.org/foundation/faq.html">Apache Software
+      Foundation FAQ</a></p>
+
+      <p>The Apache HTTP Server -- sometimes called Apache httpd -- is
+      a project of the Apache Software foundation aimed at creating a
+      robust, commercial-grade, featureful, and freely-available
+      source code implementation of an HTTP (Web) server.  For more
+      information, please see the <a
+      href="http://httpd.apache.org/ABOUT_APACHE.html">About
+      Apache</a> page.</p>
+
+    </section>
 	
 	<section id="background.what-is-httpd">
       <title>What is the Apache HTTP Server?</title>
       <ul>
         <li>is a powerful, flexible, HTTP/1.1 compliant web server</li>
-        <li>implements the latest protocols, including HTTP/1.1 (RFC2616)</li>
        <li>is highly configurable and extensible with third-party modules</li>
        <li>can be customised by writing 'modules' using the Apache 
-        module API</li>
        <li>provides full source code and comes with an 
+        <li>implements the latest protocols, including HTTP/1.1 (RFC2616)</li>
+        <li>is highly configurable and extensible with third-party modules</li>
+        <li>can be customised by writing 'modules' using the Apache module
+        API</li>
+        <li>provides full source code and comes with an 
         <a href="http://www.apache.org/licenses/LICENSE-2.0">unrestrictive 
-        license</a></li>
        <li>runs on Windows 2003/XP/2000/NT/9x, Netware 5.x and above, OS/2, 
+        license</a></li>
+        <li>runs on Windows 2003/XP/2000/NT/9x, Netware 5.x and above, OS/2, 
         and most versions of Unix, as well as several other operating 
-        systems</li>
        <li>is actively being developed</li>
        <li>encourages user feedback through new ideas, bug reports and
+        systems</li>
+        <li>is actively being developed</li>
+        <li>encourages user feedback through new ideas, bug reports and
         patches</li>
       </ul>
 	</section>
 	
 	<section id="background.tested">
       <title>How thoroughly tested is Apache?</title>
-      Apache is run on millions of Internet servers.
+      <p>Apache is run on millions of Internet servers.
       It has been tested thoroughly by both developers and users. The Apache
       HTTP Server Project maintains rigorous standards before releasing new 
       versions of our server, and our server runs without a hitch on over 
       70% of all WWW servers available on the Internet. When bugs do show 
-      up, we release patches and new versions as soon as they are available.
+      up, we release patches and new versions as soon as they are
+      available.</p>
     </section>
 
 	<section id="background.logo">
-      <title>How thoroughly tested is Apache?</title>
-      You may <em>NOT</em> use any original artwork from the Apache
+      <title>>May I use the Apache logo on my product or Web site?</title>
+      <p>You may <em>NOT</em> use any original artwork from the Apache
       Software Foundation, nor make or use modified versions of such
-      artwork, except under the following conditions:
+      artwork, except under the following conditions:</p>
       <ul>
         <li>You may use the <a 
         href="http://httpd.apache.org/docs/apache_pb.gif">'Powered by Apache'
@@ -89,8 +108,6 @@
         artwork in a manner that implies endorsement of a product or
         service is <a href="">strictly forbidden.</a></li>
       </ul>
-      For details, or related issues, please contact the Apache Software
-      Foundation's <a href="">Public Relations Committee</a>.
     </section>
  </section>
 </faq>