[deployment-guide/comm-rel: 529/727] Updated the Options directive description.

[Jaromir Hradilek]

commit 163bf45e85e8793bfd4643e2577f78c67b4eb0d2
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Tue Aug 31 16:33:23 2010 +0200

    Updated the Options directive description.

 en-US/The_Apache_HTTP_Server.xml |  139 +++++++++++++++++++++++++++++---------
 1 files changed, 108 insertions(+), 31 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index a080cec..6fd5155 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -927,7 +927,7 @@ ErrorDocument 404 /404-not_found.html</screen>
               The <replaceable>option</replaceable> has to be a valid keyword as described in <xref linkend="table-apache-httpdconf-extendedstatus" />. The default option is <option>Off</option>.
             </para>
             <table id="table-apache-httpdconf-extendedstatus">
-              <title>Available options</title>
+              <title>Available <option>ExtendedStatus</option> options</title>
               <tgroup cols="2">
                 <colspec colname="option" colnum="1" colwidth="20*" />
                 <colspec colname="description" colnum="2" colwidth="60*" />
@@ -1463,6 +1463,113 @@ ErrorDocument 404 /404-not_found.html</screen>
             </example>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term><option>Options</option></term>
+          <listitem>
+            <para>
+              The <option>Options</option> directive allows you to specify which server features are available in a particular directory. It takes the following form:
+            </para>
+            <screen>Options <replaceable>option</replaceable>...</screen>
+            <para>
+              The <replaceable>option</replaceable> has to be a valid keyword as described in <xref linkend="table-apache-httpdconf-options" />.
+            </para>
+            <table id="table-apache-httpdconf-options">
+              <title>Available server features</title>
+              <tgroup cols="2">
+                <colspec colname="option" colnum="1" colwidth="20*" />
+                <colspec colname="description" colnum="2" colwidth="60*" />
+                <thead>
+                  <row>
+                    <entry>
+                      Option
+                    </entry>
+                    <entry>
+                      Description
+                    </entry>
+                  </row>
+                </thead>
+                <tbody>
+                  <row>
+                    <entry>
+                      <option>ExecCGI</option>
+                    </entry>
+                    <entry>
+                      Enables the execution of CGI scripts.
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>
+                      <option>FollowSymLinks</option>
+                    </entry>
+                    <entry>
+                      Enables following symbolic links in the directory.
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>
+                      <option>Includes</option>
+                    </entry>
+                    <entry>
+                      Enables server-side includes.
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>
+                      <option>IncludesNOEXEC</option>
+                    </entry>
+                    <entry>
+                      Enables server-side includes, but does not allow the execution of commands.
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>
+                      <option>Indexes</option>
+                    </entry>
+                    <entry>
+                      Enables server-generated directory listings.
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>
+                      <option>MultiViews</option>
+                    </entry>
+                    <entry>
+                      Enables content-negotiated <quote>MultiViews</quote>.
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>
+                      <option>SymLinksIfOwnerMatch</option>
+                    </entry>
+                    <entry>
+                      Enables following symbolic links in the directory when both the link and the target file have the same owner.
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>
+                      <option>All</option>
+                    </entry>
+                    <entry>
+                      Enables all of the features above with the exception of <option>MultiViews</option>.
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>
+                      <option>None</option>
+                    </entry>
+                    <entry>
+                      Disables all of the features above.
+                    </entry>
+                  </row>
+                </tbody>
+              </tgroup>
+            </table>
+            <example id="example-apache-httpdconf-options">
+              <title>Using the <option>Options</option> directive</title>
+              <screen>Options Indexes FollowSymLinks</screen>
+            </example>
+          </listitem>
+        </varlistentry>
       </variablelist>
       <formalpara id="s2-apache-indexoptions">
         <title>IndexOptions</title>
@@ -1490,36 +1597,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-options">
-        <title>Options</title>
-        <indexterm>
-          <primary><command>Options</command></primary>
-          <secondary>Apache configuration directive</secondary>
-        </indexterm>
-        <indexterm>
-          <primary>configuration directives, Apache</primary>
-          <secondary><command>Options</command></secondary>
-        </indexterm>
-        <indexterm>
-          <primary>virtual hosts</primary>
-          <secondary><command>Options</command></secondary>
-        </indexterm>
-        <indexterm>
-          <primary>server side includes</primary>
-        </indexterm>
-        <para>
-          The <command>Options</command> directive controls which server features are available in a particular directory. For example, under the restrictive parameters specified for the root directory, <command>Options</command> is only set to the <command>FollowSymLinks</command> directive. No features are enabled, except that the server is allowed to follow symbolic links in the root directory.
-        </para>
-      </formalpara>
-      <para>
-        By default, in the <command>DocumentRoot</command> directory, <command>Options</command> is set to include <command>Indexes</command> and <command>FollowSymLinks</command>. <command>Indexes</command> permits the server to generate a directory listing for a directory if no <command>DirectoryIndex</command> (for example, <filename>index.html</filename>) is specified. <command>FollowSymLinks</command> allows the server to follow symbolic links in that directory.
-      </para>
-      <note>
-        <title>Note</title>
-        <para>
-          <command>Options</command> statements from the main server configuration section need to be replicated to each <command>VirtualHost</command> container individually. Refer to <xref linkend="s2-apache-virtualhost" /> for more information.
-        </para>
-      </note>
       <formalpara id="s2-apache-order">
         <title>Order</title>
         <indexterm>