From: Daniel Gruno Date: Sun, 24 Jun 2012 13:14:25 +0000 (+0000) Subject: xforms X-Git-Tag: 2.5.0-alpha~6701 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=916373a30bdbabd56b675ca4ebee6e9b74110fb8;p=thirdparty%2Fapache%2Fhttpd.git xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1353264 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.xml.meta b/docs/manual/mod/core.xml.meta index b9d96ee4c52..e78755527af 100644 --- a/docs/manual/mod/core.xml.meta +++ b/docs/manual/mod/core.xml.meta @@ -10,7 +10,7 @@ de en es - fr + fr ja tr diff --git a/docs/manual/mod/mod_dir.html.en b/docs/manual/mod/mod_dir.html.en index 1f24f857fab..0234d89f5ba 100644 --- a/docs/manual/mod/mod_dir.html.en +++ b/docs/manual/mod/mod_dir.html.en @@ -119,19 +119,28 @@ a directory as well.

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

-# Set the index files to look for
-DirectoryIndex index.html index.htm
+# 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>
 
-# This will add dynamic files to the list rather than replace it
-DirectoryIndex index.php index.pl index.lua
+# Example B: This is identical to example A, except it's done with a single directive.
+<Directory /foo>
+    DirectoryIndex index.html index.php
+</Directory>
 
-# To replace the list, we must first reset it, then set the new list
-DirectoryIndex disabled
-DirectoryIndex index.py
+# Example C: To replace the list, you must explicitly do so:
+# In this example, only index.php will remain as an index resource.
+<Directory /foo>
+    DirectoryIndex index.html
+    DirectoryIndex disabled
+    DirectoryIndex index.php
+</Directory>
diff --git a/docs/manual/mod/mod_dir.xml.ja b/docs/manual/mod/mod_dir.xml.ja index 0ddd5e43b45..d70c32fd5cc 100644 --- a/docs/manual/mod/mod_dir.xml.ja +++ b/docs/manual/mod/mod_dir.xml.ja @@ -1,7 +1,7 @@ - + + +