[deployment-guide/comm-rel: 549/727] Updated the ServerRoot directive description.

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


commit a6aec566abd0ef90e0a18feb131f717c95dcceed
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Wed Sep 1 18:18:17 2010 +0200

    Updated the ServerRoot directive description.

 en-US/The_Apache_HTTP_Server.xml |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index 83a9dc3..f95bc12 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -779,7 +779,7 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
             </para>
             <screen>CacheRoot <replaceable>directory</replaceable></screen>
             <para>
-              The <replaceable>directory</replaceable> is a full path to an existing directory in the local file system. The default option is <filename class="directory">/var/cache/mod_proxy/</filename>.
+              The <replaceable>directory</replaceable> must be a full path to an existing directory in the local file system. The default option is <filename class="directory">/var/cache/mod_proxy/</filename>.
             </para>
             <example id="example-apache-httpdconf-cacheroot">
               <title>Using the <option>CacheRoot</option> directive</title>
@@ -875,7 +875,7 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
             </para>
             <screen>DocumentRoot <replaceable>directory</replaceable></screen>
             <para>
-              The <replaceable>directory</replaceable> is a full path to an existing directory in the local file system. The default option is <filename class="directory">/var/www/html/</filename>.
+              The <replaceable>directory</replaceable> must be a full path to an existing directory in the local file system. 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>
@@ -1837,6 +1837,22 @@ ErrorDocument 404 /404-not_found.html</screen>
             </example>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term><option>ServerRoot</option></term>
+          <listitem>
+            <para>
+              The <option>ServerRoot</option> directive allows you to specify the directory in which the server operates. It takes the following form:
+            </para>
+            <screen>ServerRoot <replaceable>directory</replaceable></screen>
+            <para>
+              The <replaceable>directory</replaceable> must be a full path to an existing directory in the local file system. The default option is <filename class="directory">/etc/httpd/</filename>.
+            </para>
+            <example id="example-apache-httpd-serverroot">
+              <title>Using the <option>ServerRoot</option> directive</title>
+              <screen>ServerRoot /etc/httpd</screen>
+            </example>
+          </listitem>
+        </varlistentry>
       </variablelist>
       <formalpara id="s2-apache-indexoptions">
         <title>IndexOptions</title>
@@ -1864,20 +1880,6 @@ 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>
-      <formalpara id="s2-apache-serverroot">
-        <title>ServerRoot</title>
-        <indexterm>
-          <primary><command>ServerRoot</command></primary>
-          <secondary>Apache configuration directive</secondary>
-        </indexterm>
-        <indexterm>
-          <primary>configuration directives, Apache</primary>
-          <secondary><command>ServerRoot</command></secondary>
-        </indexterm>
-        <para>
-          The <command>ServerRoot</command> directive specifies the top-level directory containing website content. By default, <command>ServerRoot</command> is set to <filename>"/etc/httpd"</filename> for both secure and non-secure servers.
-        </para>
-      </formalpara>
       <formalpara id="s2-apache-serversignature">
         <title>ServerSignature</title>
         <indexterm>


More information about the docs-commits mailing list