[deployment-guide/comm-rel: 583/727] Renamed a couple of sections.

Tue Oct 19 13:14:01 UTC 2010

commit dee2d62e08e6e253e8330eb9cd7ae5403934474e
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Fri Sep 3 19:45:55 2010 +0200

    Renamed a couple of sections.
    
    I have also grouped all tag descriptions in a separate section.

 en-US/The_Apache_HTTP_Server.xml |   61 +++++++++++++++++---------------------
 1 files changed, 27 insertions(+), 34 deletions(-)
---

diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index e50051d..addef65 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -208,25 +208,28 @@ httpd (pid 19014) is running...</screen>
     <para>
       The Apache HTTP Server configuration file is <filename>/etc/httpd/conf/httpd.conf</filename>. The <filename>httpd.conf</filename> file is well-commented and mostly self-explanatory. The default configuration works for most situations; however, it is a good idea to become familiar some of the more important configuration options.
     </para>
-    <section id="s2-apache-tips">
-      <title>General Configuration Tips</title>
-      <para>
-        If configuring the Apache HTTP Server, edit <filename>/etc/httpd/conf/httpd.conf</filename> and then either reload, restart, or stop and start the <command>httpd</command> process as outlined in <xref linkend="s1-apache-startstop" />.
-      </para>
-      <para>
-        Before editing <filename>httpd.conf</filename>, make a copy the original file. Creating a backup makes it easier to recover from mistakes made while editing the configuration file.
-      </para>
-      <para>
-        If a mistake is made and the Web server does not work correctly, first review recently edited passages in <filename>httpd.conf</filename> to verify there are no typos.
-      </para>
-      <para>
-        Next look in the Web server's error log, <filename>/var/log/httpd/error_log</filename>. The error log may not be easy to interpret, depending on your level of expertise. However, the last entries in the error log should provide useful information.
-      </para>
-      <para>
-        The following subsections contain a list of short descriptions for many of the directives included in <filename>httpd.conf</filename>. These descriptions are not exhaustive. For more information, refer to the Apache documentation online at <ulink url="http://httpd.apache.org/docs/2.2/">http://httpd.apache.org/docs/2.2/</ulink>.
-      </para>
+    <para>
+      If configuring the Apache HTTP Server, edit <filename>/etc/httpd/conf/httpd.conf</filename> and then either reload, restart, or stop and start the <command>httpd</command> process as outlined in <xref linkend="s1-apache-startstop" />.
+    </para>
+    <para>
+      Before editing <filename>httpd.conf</filename>, make a copy the original file. Creating a backup makes it easier to recover from mistakes made while editing the configuration file.
+    </para>
+    <para>
+      If a mistake is made and the Web server does not work correctly, first review recently edited passages in <filename>httpd.conf</filename> to verify there are no typos.
+    </para>
+    <para>
+      Next look in the Web server's error log, <filename>/var/log/httpd/error_log</filename>. The error log may not be easy to interpret, depending on your level of expertise. However, the last entries in the error log should provide useful information.
+    </para>
+    <para>
+      The following subsections contain a list of short descriptions for many of the directives included in <filename>httpd.conf</filename>. These descriptions are not exhaustive. For more information, refer to the Apache documentation online at <ulink url="http://httpd.apache.org/docs/2.2/">http://httpd.apache.org/docs/2.2/</ulink>.
+    </para>
+    <para>
+      For more information about <filename>mod_ssl</filename> directives, refer to the documentation online at <ulink url="http://httpd.apache.org/docs/2.2/mod/mod_ssl.html" />.
+    </para>
+    <section id="s2-apache-httpdconf-directives">
+      <title>Common <filename>httpd.conf</filename> Directives</title>
       <para>
-        For more information about <filename>mod_ssl</filename> directives, refer to the documentation online at <ulink url="http://httpd.apache.org/docs/2.2/mod/mod_ssl.html" />.
+        The following directives are commonly used in the <filename>/etc/httpd/conf/httpd.conf</filename> configuration file:
       </para>
       <variablelist>
         <varlistentry>
@@ -2220,15 +2223,12 @@ ErrorDocument 404 /404-not_found.html</screen>
       <para>
         <command>IndexOptions</command> has a number of other parameters which can be set to control the appearance of server generated directories. The <command>IconHeight</command> and <command>IconWidth</command> parameters require the server to include HTML <command>HEIGHT</command> and <command>WIDTH</command> tags for the icons in server generated webpages. The <command>IconsAreLinks</command> parameter combines the graphical icon with the HTML link anchor, which contains the URL link target.
       </para>
+    </section>
+    <section id="s2-apache-httpdconf-tags">
+      <title>Common <filename>httpd.conf</filename> Tags</title>
       <para>
-        A commented <command>VirtualHost</command> container is provided in <filename>httpd.conf</filename>, which illustrates the minimum set of configuration directives necessary for each virtual host. Refer to <xref linkend="s1-apache-virtualhosts" /> for more information about virtual hosts.
+        The following tags are commonly used in the <filename>/etc/httpd/conf/httpd.conf</filename> configuration file:
       </para>
-      <note>
-        <title>Note</title>
-        <para>
-          The default SSL virtual host container now resides in the file <filename>/etc/httpd/conf.d/ssl.conf</filename>.
-        </para>
-      </note>
       <formalpara id="s2-apache-directory">
         <title>Directory</title>
         <indexterm>
@@ -2373,15 +2373,8 @@ ErrorDocument 404 /404-not_found.html</screen>
         </para>
       </note>
     </section>
-    <section id="s2-apache-sslcommands">
-      <title>Configuration Directives for SSL</title>
-      <indexterm>
-        <primary>SSL configuration</primary>
-      </indexterm>
-      <indexterm>
-        <primary>configuration directives, Apache</primary>
-        <secondary>SSL configuration</secondary>
-      </indexterm>
+    <section id="s2-apache-sslconf-common">
+      <title>Common <filename>ssl.conf</filename> Directives</title>
       <para>
         The directives in <filename>/etc/httpd/conf.d/ssl.conf</filename> file can be configured to enable secure Web communications using SSL and TLS.
       </para>
