[deployment-guide/comm-rel: 502/727] Updated the DocumentRoot directive description.

[Jaromir Hradilek]

commit 45b4b5bef842568daa19e8974b864665377350d8
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Thu Aug 26 14:32:09 2010 +0200

    Updated the DocumentRoot directive description.

 en-US/The_Apache_HTTP_Server.xml |   40 ++++++++++++++++---------------------
 1 files changed, 17 insertions(+), 23 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index f765357..44a380b 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -847,34 +847,28 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
               By default, the server looks for <filename>index.html</filename> or <filename>index.html.var</filename>.
             </para>
             <example id="example-apache-httpdconf-directoryindex">
-              <title>Using the <option>DirectoryIndex</option> option</title>
+              <title>Using the <option>DirectoryIndex</option> directive</title>
               <screen>DirectoryIndex index.html index.html.var</screen>
             </example>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term><option>DocumentRoot</option></term>
+          <listitem>
+            <para>
+              The <option>DocumentRoot</option> directive allows you to specify the main directory from which the content is served. It takes the following form:
+            </para>
+            <screen>DocumentRoot <replaceable>directory</replaceable></screen>
+            <para>
+              The default option is <filename class="directory">/var/www/html/</filename>.
+            </para>
+            <example id="example-apache-httpdconf-documentroot">
+              <title>Using the <option>DocumentRoot</option> directive</title>
+              <screen>DocumentRoot /var/www/html</screen>
+            </example>
+          </listitem>
+        </varlistentry>
       </variablelist>
-      <formalpara id="s2-apache-documentroot">
-        <title>DocumentRoot</title>
-        <indexterm>
-          <primary><command>DocumentRoot</command></primary>
-          <secondary>Apache configuration directive</secondary>
-        </indexterm>
-        <indexterm>
-          <primary>configuration directives, Apache</primary>
-          <secondary><command>DocumentRoot</command></secondary>
-        </indexterm>
-        <para>
-          <command>DocumentRoot</command> is the directory which contains most of the HTML files which are served in response to requests. The default <command>DocumentRoot</command>, for both the non-secure and secure Web servers, is the <filename>/var/www/html</filename> directory. For example, the server might receive a request for the following document:
-        </para>
-      </formalpara>
-      <screen><command>http://example.com/foo.html</command></screen>
-      <para>
-        The server looks for the following file in the default directory:
-      </para>
-      <screen><filename>/var/www/html/foo.html</filename></screen>
-      <para>
-        To change the <command>DocumentRoot</command> so that it is not shared by the secure and the non-secure Web servers, refer to <xref linkend="s1-apache-virtualhosts" />.
-      </para>
       <formalpara id="s2-apache-errordocument">
         <title>ErrorDocument</title>
         <indexterm>