[deployment-guide/comm-rel: 455/727] Updated the Apache HTTP Server chapter introduction.

Jaromir Hradilek jhradile at fedoraproject.org
Tue Oct 19 13:03:06 UTC 2010


commit ce76ca19f079f83e995c195453d181784aec0899
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Mon Aug 23 15:33:16 2010 +0200

    Updated the Apache HTTP Server chapter introduction.

 en-US/The_Apache_HTTP_Server.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index 37156af..776e69e 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -4,18 +4,18 @@
 <chapter id="ch-The_Apache_HTTP_Server">
   <title>The Apache HTTP Server</title>
   <indexterm>
-    <primary>Apache HTTP Server</primary>
-    <secondary>introducing</secondary>
+    <primary>HTTP server</primary>
+    <see><application>Apache HTTP Server</application></see>
   </indexterm>
   <indexterm>
-    <primary>Apache</primary>
-    <see>Apache HTTP Server</see>
+    <primary>web server</primary>
+    <see><application>Apache HTTP Server</application></see>
   </indexterm>
   <para>
-    The Apache HTTP Server is a robust, commercial-grade open source Web server developed by the Apache Software Foundation (<ulink url="http://www.apache.org/">http://www.apache.org/</ulink>). &MAJOROSVER; includes the Apache HTTP Server 2.2 as well as a number of server modules designed to enhance its functionality.
+    <systemitem class="protocol">HTTP</systemitem> (Hypertext Transfer Protocol) server, or a <firstterm>web server</firstterm>, is a network service that delivers content such as web pages to clients over the web.
   </para>
   <para>
-    The default configuration file installed with the Apache HTTP Server works without alteration for most situations. This chapter outlines many of the directives found within its configuration file (<filename>/etc/httpd/conf/httpd.conf</filename>) to aid those who require a custom configuration or need to convert a configuration file from the older Apache HTTP Server 1.3 format.
+    This chapter covers the <application>Apache HTTP Server</application>, a robust, full-featured open source web server developed by the <ulink url="http://www.apache.org/">Apache Software Foundation</ulink>, that is included in &MAJOROSVER;. It covers the basic configuration of the <systemitem class="service">httpd</systemitem> service, as well as advanced topics such as adding server modules, setting up virtual hosts, and configuring the secure HTTP server.
   </para>
   <section id="s1-httpd-v2">
     <title>Apache HTTP Server 2.2</title>


More information about the docs-commits mailing list