Backport as much as possible from the changes to 2.4/trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1353522 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_dir.xml b/docs/manual/mod/mod_dir.xml
index 23762ca45af9afb8a1e3bd3a202a17321631603b..c019d7b11f751e216a4c5bd2c5ac98310b4d3119 100644 (file)
--- a/docs/manual/mod/mod_dir.xml
+++ b/docs/manual/mod/mod_dir.xml
@@ -94,6 +94,24 @@ a directory</description>
     <p>would cause the CGI script <code>/cgi-bin/index.pl</code> to be
     executed if neither <code>index.html</code> or <code>index.txt</code>
     existed in a directory.</p>
+
+    <p><strong>Note:</strong> Multiple <directive>DirectoryIndex</directive> 
+    directives within the <a href="../sections.html"><em>same context</em></a> will add 
+    to the list of resources to look for rather than replace:
+    </p>
+
+    <example>
+    <pre># Example A: Set index.html as an index page, then add index.php to that list as well.
+&lt;Directory /foo&gt;
+    DirectoryIndex index.html
+    DirectoryIndex index.php
+&lt;/Directory&gt;
+
+# Example B: This is identical to example A, except it's done with a single directive.
+&lt;Directory /foo&gt;
+    DirectoryIndex index.html index.php
+&lt;/Directory&gt;</pre>
+    </example>
 </usage>
 </directivesynopsis>