Return-Path: 
 <cvs-return-22904-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 42993 invoked from network); 19 Sep 2005 16:04:47 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 19 Sep 2005 16:04:47 -0000
Received: (qmail 70693 invoked by uid 500); 19 Sep 2005 16:04:44 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 70504 invoked by uid 500); 19 Sep 2005 16:04:43 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 70491 invoked by uid 99); 19 Sep 2005 16:04:43 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Mon, 19 Sep 2005 09:04:42 -0700
Received: (qmail 42940 invoked by uid 65534); 19 Sep 2005 16:04:40 -0000
Message-ID: <20050919160440.42939.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r290193 -
 /httpd/httpd/branches/2.2.x/docs/manual/faq/background.xml
Date: Mon, 19 Sep 2005 16:04:40 -0000
To: cvs@httpd.apache.org
From: nd@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: nd
Date: Mon Sep 19 09:04:34 2005
New Revision: 290193

URL: http://svn.apache.org/viewcvs?rev=290193&view=rev
Log:
backport docs/manual/faq/background.xml from trunk

Modified:
    httpd/httpd/branches/2.2.x/docs/manual/faq/background.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/faq/background.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/faq/background.xml?rev=290193&r1=290192&r2=290193&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/faq/background.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/faq/background.xml Mon Sep 19 09:04:34 2005
@@ -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>