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 ce53b4b3defbcf0eeb615c01a4c8849f14daed97..c6cb6d9e8189fc65435ed54bbd80cd917501b04b 100644 (file)
--- a/docs/manual/mod/core.xml.meta
+++ b/docs/manual/mod/core.xml.meta
@@ -9,7 +9,7 @@
   <variants>
     <variant outdated="yes">de</variant>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">tr</variant>
   </variants>

diff --git a/docs/manual/mod/mod_dir.html.en b/docs/manual/mod/mod_dir.html.en
index ae648e480fac56181117d151af9e0c651e0ad591..d1b69529310075b25374fefc769a12c9787f2f63 100644 (file)
--- a/docs/manual/mod/mod_dir.html.en
+++ b/docs/manual/mod/mod_dir.html.en
@@ -109,6 +109,22 @@ a directory</td></tr>
     executed if neither <code>index.html</code> or <code>index.txt</code>
     existed in a directory.</p>
 
+    <p><strong>Note:</strong> Multiple <code class="directive">DirectoryIndex</code> 
+    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>
+
+    <div class="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></div>
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="DirectorySlash" id="DirectorySlash">DirectorySlash</a> <a name="directoryslash" id="directoryslash">Directive</a></h2>

diff --git a/docs/manual/mod/mod_dir.xml.ja b/docs/manual/mod/mod_dir.xml.ja
index f25dd2ae25a6b372362e32bbc8f657f0c74f7b0b..00ce728c5ebe7ff1b1d11da261da0b78cf881716 100644 (file)
--- a/docs/manual/mod/mod_dir.xml.ja
+++ b/docs/manual/mod/mod_dir.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 421100:1147330 (outdated) -->
+<!-- English Revision: 421100:1353522 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_dir.xml.ko b/docs/manual/mod/mod_dir.xml.ko
index d4b92bff7a627f4a7f6060c051fadb1a6d987c5b..5f6d05177c3de5575830694e857d0141f075ae96 100644 (file)
--- a/docs/manual/mod/mod_dir.xml.ko
+++ b/docs/manual/mod/mod_dir.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:1147330 (outdated) -->
+<!-- English Revision: 151408:1353522 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_dir.xml.meta b/docs/manual/mod/mod_dir.xml.meta
index 52477eaf280a4cc8d7d649f7a6eca8cfeaf83f57..67d96f58b8b00bf6d5ef2dfd0ca0f9243cb8ad18 100644 (file)
--- a/docs/manual/mod/mod_dir.xml.meta
+++ b/docs/manual/mod/mod_dir.xml.meta
@@ -10,6 +10,6 @@
     <variant>en</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/mod/mod_dir.xml.tr b/docs/manual/mod/mod_dir.xml.tr
index 341ef9b9d63c60587231626d8f4e794c77822cdd..913557cb0d9933105664bc66ca294f689df07c36 100644 (file)
--- a/docs/manual/mod/mod_dir.xml.tr
+++ b/docs/manual/mod/mod_dir.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1147330 -->
+<!-- English Revision: 1147330:1353522 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>