From: Daniel Gruno
Date: Mon, 25 Jun 2012 13:21:19 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.2.23~150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6750d44cf3115d819cc81095147c41e03572440;p=thirdparty%2Fapache%2Fhttpd.git
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1353525 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/mod/core.xml.meta b/docs/manual/mod/core.xml.meta
index ce53b4b3def..c6cb6d9e818 100644
--- a/docs/manual/mod/core.xml.meta
+++ b/docs/manual/mod/core.xml.meta
@@ -9,7 +9,7 @@
de
en
- fr
+ fr
ja
tr
diff --git a/docs/manual/mod/mod_dir.html.en b/docs/manual/mod/mod_dir.html.en
index ae648e480fa..d1b69529310 100644
--- a/docs/manual/mod/mod_dir.html.en
+++ b/docs/manual/mod/mod_dir.html.en
@@ -109,6 +109,22 @@ a directory
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>
+
diff --git a/docs/manual/mod/mod_dir.xml.ja b/docs/manual/mod/mod_dir.xml.ja
index f25dd2ae25a..00ce728c5eb 100644
--- a/docs/manual/mod/mod_dir.xml.ja
+++ b/docs/manual/mod/mod_dir.xml.ja
@@ -1,7 +1,7 @@
-
+
+
+