[deployment-guide/comm-rel: 629/727] Updated the Editing the Configuration Files section introduction.

[Jaromir Hradilek]

commit 1fce3d3487299994ea73bdb2cd64dacbfe9a92b8
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Wed Sep 8 15:26:55 2010 +0200

    Updated the Editing the Configuration Files section introduction.

 en-US/The_Apache_HTTP_Server.xml |   54 ++++++++++++++++++++++++++++---------
 1 files changed, 41 insertions(+), 13 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index 9d5bebd..5cb3905 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -201,25 +201,53 @@ httpd (pid 19014) is running...</screen>
   <section id="s1-apache-editing">
     <title>Editing the Configuration Files</title>
     <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.
+      When the <systemitem class="service">httpd</systemitem> service is started, by default, it reads the configuration from locations that are listed in <xref linkend="table-apache-editing-files" />.
     </para>
+    <table id="table-apache-editing-files">
+      <title>The <systemitem class="service">httpd</systemitem> service configuration files</title>
+      <tgroup cols="2">
+        <colspec colname="option" colnum="1" colwidth="30*" />
+        <colspec colname="description" colnum="2" colwidth="60*" />
+        <thead>
+          <row>
+            <entry>
+              Path
+            </entry>
+            <entry>
+              Description
+            </entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry>
+              <filename>/etc/httpd/conf/httpd.conf</filename>
+            </entry>
+            <entry>
+              The main configuration file.
+            </entry>
+          </row>
+          <row>
+            <entry>
+              <filename class="directory">/etc/httpd/conf.d/</filename>
+            </entry>
+            <entry>
+              An auxiliary directory for configuration files that are included in the main configuration file.
+            </entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
     <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-running" />.
+      Although the default configuration should be suitable for most situations, it is a good idea to become at least familiar with some of the more important configuration options. Note that for any changes to take effect, the web server has to be restarted first. Refer to <xref linkend="s3-apache-running-restarting" /> for more information on how to restart the <systemitem class="service">httpd</systemitem> service.
     </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>.
+       To check the configuration for possible errors, type the following at a shell prompt:
     </para>
+    <screen>~]# <command>service httpd configtest</command>
+Syntax OK</screen>
     <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" />.
+      To make the recovery from mistakes easier, it is recommended that you make a copy of the original file before editing it.
     </para>
     <section id="s2-apache-httpdconf-directives">
       <title>Common <filename>httpd.conf</filename> Directives</title>