[deployment-guide/comm-rel: 500/727] Moved the Directory tag description at the end of the section.

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


commit 058fcf801c9163b629bedcde9052e0d9e9fcbc3c
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Thu Aug 26 11:43:47 2010 +0200

    Moved the Directory tag description at the end of the section.
    
    I do not intend to mix directives with tags.

 en-US/The_Apache_HTTP_Server.xml |   80 +++++++++++++++++++-------------------
 1 files changed, 40 insertions(+), 40 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index 2429661..d281048 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -837,46 +837,6 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
           </listitem>
         </varlistentry>
       </variablelist>
-      <formalpara id="s2-apache-directory">
-        <title>Directory</title>
-        <indexterm>
-          <primary><command>Directory</command></primary>
-          <secondary>Apache configuration directive</secondary>
-        </indexterm>
-        <indexterm>
-          <primary>configuration directives, Apache</primary>
-          <secondary><command>Directory</command></secondary>
-        </indexterm>
-        <para>
-          <command>&lt;Directory /path/to/directory&gt;</command> and <command>&lt;/Directory&gt;</command> tags create a container used to enclose a group of configuration directives which apply only to a specific directory and its subdirectories. Any directive which is applicable to a directory may be used within <command>Directory</command> tags.
-        </para>
-      </formalpara>
-      <para>
-        By default, very restrictive parameters are applied to the root directory (<filename>/</filename>), using the <command>Options</command> (refer to <xref linkend="s2-apache-options" />) and <command>AllowOverride</command> <!-- (refer to <xref linkend="s2-apache-allowoverride" />) -->directives. Under this configuration, any directory on the system which needs more permissive settings has to be explicitly given those settings.
-      </para>
-      <para>
-        In the default configuration, another <command>Directory</command> container is configured for the <command>DocumentRoot</command> which assigns less rigid parameters to the directory tree so that the Apache HTTP Server can access the files residing there.
-      </para>
-      <indexterm>
-        <primary>CGI scripts</primary>
-        <secondary>allowing execution outside <filename>cgi-bin</filename></secondary>
-      </indexterm>
-      <para>
-        The <command>Directory</command> container can be also be used to configure additional <filename>cgi-bin</filename> directories for server-side applications outside of the directory specified in the <command>ScriptAlias</command> directive (refer to <xref linkend="s2-apache-scriptalias" /> for more information).
-      </para>
-      <para>
-        To accomplish this, the <command>Directory</command> container must set the <command>ExecCGI</command> option for that directory.
-      </para>
-      <para>
-        For example, if CGI scripts are located in <command>/home/my_cgi_directory</command>, add the following <command>Directory</command> container to the <filename>httpd.conf</filename> file:
-      </para>
-      <screen><command>&lt;Directory /home/my_cgi_directory&gt; Options +ExecCGI &lt;/Directory&gt;</command></screen>
-      <para>
-        Next, the <command>AddHandler</command> directive must be uncommented to identify files with the <filename>.cgi</filename> extension as CGI scripts. <!-- Refer to <xref linkend="s2-apache-addhandler" /> for instructions on setting <command>AddHandler</command>. -->
-      </para>
-      <para>
-        For this to work, permissions for CGI scripts, and the entire path to the scripts, must be set to 0755.
-      </para>
       <formalpara id="s2-apache-directoryindex">
         <title>DirectoryIndex</title>
         <indexterm>
@@ -1793,6 +1753,46 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
           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>
+          <primary><command>Directory</command></primary>
+          <secondary>Apache configuration directive</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>configuration directives, Apache</primary>
+          <secondary><command>Directory</command></secondary>
+        </indexterm>
+        <para>
+          <command>&lt;Directory /path/to/directory&gt;</command> and <command>&lt;/Directory&gt;</command> tags create a container used to enclose a group of configuration directives which apply only to a specific directory and its subdirectories. Any directive which is applicable to a directory may be used within <command>Directory</command> tags.
+        </para>
+      </formalpara>
+      <para>
+        By default, very restrictive parameters are applied to the root directory (<filename>/</filename>), using the <command>Options</command> (refer to <xref linkend="s2-apache-options" />) and <command>AllowOverride</command> <!-- (refer to <xref linkend="s2-apache-allowoverride" />) -->directives. Under this configuration, any directory on the system which needs more permissive settings has to be explicitly given those settings.
+      </para>
+      <para>
+        In the default configuration, another <command>Directory</command> container is configured for the <command>DocumentRoot</command> which assigns less rigid parameters to the directory tree so that the Apache HTTP Server can access the files residing there.
+      </para>
+      <indexterm>
+        <primary>CGI scripts</primary>
+        <secondary>allowing execution outside <filename>cgi-bin</filename></secondary>
+      </indexterm>
+      <para>
+        The <command>Directory</command> container can be also be used to configure additional <filename>cgi-bin</filename> directories for server-side applications outside of the directory specified in the <command>ScriptAlias</command> directive (refer to <xref linkend="s2-apache-scriptalias" /> for more information).
+      </para>
+      <para>
+        To accomplish this, the <command>Directory</command> container must set the <command>ExecCGI</command> option for that directory.
+      </para>
+      <para>
+        For example, if CGI scripts are located in <command>/home/my_cgi_directory</command>, add the following <command>Directory</command> container to the <filename>httpd.conf</filename> file:
+      </para>
+      <screen><command>&lt;Directory /home/my_cgi_directory&gt; Options +ExecCGI &lt;/Directory&gt;</command></screen>
+      <para>
+        Next, the <command>AddHandler</command> directive must be uncommented to identify files with the <filename>.cgi</filename> extension as CGI scripts. <!-- Refer to <xref linkend="s2-apache-addhandler" /> for instructions on setting <command>AddHandler</command>. -->
+      </para>
+      <para>
+        For this to work, permissions for CGI scripts, and the entire path to the scripts, must be set to 0755.
+      </para>
     </section>
     <section id="s2-apache-sslcommands">
       <title>Configuration Directives for SSL</title>


More information about the docs-commits mailing list