xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1353264 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 22 insertions, 13 deletions

diff --git a/docs/manual/mod/core.xml.meta b/docs/manual/mod/core.xml.meta
index b9d96ee4c5..e78755527a 100644
--- a/docs/manual/mod/core.xml.meta
+++ b/docs/manual/mod/core.xml.meta
@@ -10,7 +10,7 @@
     <variant outdated="yes">de</variant>
     <variant>en</variant>
     <variant outdated="yes">es</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 1f24f857fa..0234d89f5b 100644
--- a/docs/manual/mod/mod_dir.html.en
+++ b/docs/manual/mod/mod_dir.html.en
@@ -119,19 +119,28 @@ a directory</td></tr>
     as well.</p>
 
     <p><strong>Note:</strong> Multiple <code class="directive">DirectoryIndex</code> 
-    directives within the <em>same context</em> will add to the list of resources to 
-    look for rather than replace:
+    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>
     <pre class="prettyprint lang-config">
-# 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.
+&lt;Directory /foo&gt;
+    DirectoryIndex index.html
+    DirectoryIndex index.php
+&lt;/Directory&gt;
 
-# 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.
+&lt;Directory /foo&gt;
+    DirectoryIndex index.html index.php
+&lt;/Directory&gt;
 
-# 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.
+&lt;Directory /foo&gt;
+    DirectoryIndex index.html
+    DirectoryIndex disabled
+    DirectoryIndex index.php
+&lt;/Directory&gt;
     </pre>
 
 
diff --git a/docs/manual/mod/mod_dir.xml.ja b/docs/manual/mod/mod_dir.xml.ja
index 0ddd5e43b4..d70c32fd5c 100644
--- 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: 420990:1353250 (outdated) -->
+<!-- English Revision: 420990:1353263 (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 d07582b1fa..0995f5f2ef 100644
--- 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:1353250 (outdated) -->
+<!-- English Revision: 151408:1353263 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_dir.xml.tr b/docs/manual/mod/mod_dir.xml.tr
index 1d6a095a28..38001a98cc 100644
--- 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: 1307726:1353250 (outdated) -->
+<!-- English Revision: 1307726:1353263 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>