From: Daniel Gruno Date: Mon, 25 Jun 2012 13:18:16 +0000 (+0000) Subject: Backport as much as possible from the changes to 2.4/trunk. X-Git-Tag: 2.2.23~151 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8419df845662fb63955c4b035d8d7a4177da750c;p=thirdparty%2Fapache%2Fhttpd.git 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 23762ca45af..c019d7b11f7 100644 --- a/docs/manual/mod/mod_dir.xml +++ b/docs/manual/mod/mod_dir.xml @@ -94,6 +94,24 @@ a directory

would cause the CGI script /cgi-bin/index.pl to be executed if neither index.html or index.txt existed in a directory.

+ +

Note: Multiple DirectoryIndex + directives within the same context will add + to the list of resources to look for rather than replace: +

+ + +
# Example A: Set index.html as an index page, then add index.php to that list as well.
+<Directory /foo>
+    DirectoryIndex index.html
+    DirectoryIndex index.php
+</Directory>
+
+# Example B: This is identical to example A, except it's done with a single directive.
+<Directory /foo>
+    DirectoryIndex index.html index.php
+</Directory>
+