[deployment-guide/comm-rel: 511/727] Updated the Include directive description.

Jaromir Hradilek jhradile at fedoraproject.org
Tue Oct 19 13:07:52 UTC 2010


commit 81f06565cebd8f851e76d53ef45ef91a904568bc
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Sat Aug 28 16:28:57 2010 +0200

    Updated the Include directive description.

 en-US/The_Apache_HTTP_Server.xml |   40 +++++++++++++++----------------------
 1 files changed, 16 insertions(+), 24 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index b9658c9..d3d7c2a 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -1046,31 +1046,23 @@ ErrorDocument 404 /404-not_found.html</screen>
             </example>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term><option>Include</option></term>
+          <listitem>
+            <para>
+              The <option>Include</option> directive allows you to include other configuration files. It takes the following form:
+            </para>
+            <screen>Include <replaceable>filename</replaceable></screen>
+            <para>
+              The <option>filename</option> option can be either an absolute path, a path relative to the directory specified by the <option>ServerRoot</option> directive, or a wildcard expression. All configuration files from the <filename class="directory">/etc/httpd/conf.d/</filename> directory are loaded by default.
+            </para>
+            <example id="example-apache-httpdconf-include">
+              <title>Using the <option>Include</option> directive</title>
+              <screen>Include conf.d/*.conf</screen>
+            </example>
+          </listitem>
+        </varlistentry>
       </variablelist>
-      <formalpara id="s2-apache-include">
-        <title>Include</title>
-        <indexterm>
-          <primary><command>Include</command></primary>
-          <secondary>Apache configuration directive</secondary>
-        </indexterm>
-        <indexterm>
-          <primary>configuration directives, Apache</primary>
-          <secondary><command>Include</command></secondary>
-        </indexterm>
-        <para>
-          <command>Include</command> allows other configuration files to be included at runtime.
-        </para>
-      </formalpara>
-      <para>
-        The path to these configuration files can be absolute or relative to the <command>ServerRoot</command>.
-      </para>
-      <important>
-        <title>Important</title>
-        <para>
-          For the server to use individually packaged modules, such as <filename>mod_ssl</filename>, <filename>mod_perl</filename>, and <filename>php</filename>, the following directive must be included in <command>Section 1: Global Environment</command> of <filename>httpd.conf</filename>:
-        </para>
-        <screen><command>Include conf.d/*.conf</command></screen>
-      </important>
       <formalpara id="s2-apache-indexignore">
         <title>IndexIgnore</title>
         <indexterm>


More information about the docs-commits mailing list