xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1550688 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index f394137517944b9d4b150d8365fe8892bb65c1f6..19eaacd499208a9f7cf0bd19522204041d84a96e 100644 (file)
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -1952,6 +1952,8 @@ satisfied by a request at runtime</td></tr>
     documentation is available in <a href="../expr.html">Expressions in
     Apache HTTP Server</a>.</p>
 
+    <p>Only directives that support the <a href="mod/directive-dict.html#Context">directory context</a> can be used within this configuration section.</p>
+
 
 <h3>See also</h3>
 <ul>

diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 13202a048df721d506057688596f8f3c8aef63e7..51b262f8aa8ecfdfcfbca10c2254dee01cdf5d5f 100644 (file)
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 344972:1450091 (outdated) -->
+<!-- English Revision: 344972:1544630 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/core.xml.es b/docs/manual/mod/core.xml.es
index 9daa885aadd46208dd59a50fec88187ba9558301..97bcf22864859bc46f479aebca3ef08d2255534e 100644 (file)
--- a/docs/manual/mod/core.xml.es
+++ b/docs/manual/mod/core.xml.es
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- English Revision: 1040494:1450091 (outdated) -->
+<!-- English Revision: 1040494:1544630 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index c3bdf86dc3dc62126926920d8490d7b057fdb222..6b248058f3fa39f5e0a7b5980deb542b1ebba3b5 100644 (file)
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.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: 669847:1450091 (outdated) -->
+<!-- English Revision: 669847:1544630 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/core.xml.meta b/docs/manual/mod/core.xml.meta
index 189b445c6951ef5b9d23698ac297cd8868c04c7b..e78755527afd76e79a93204836e49a52f246c2bf 100644 (file)
--- a/docs/manual/mod/core.xml.meta
+++ b/docs/manual/mod/core.xml.meta
@@ -12,6 +12,6 @@
     <variant outdated="yes">es</variant>
     <variant>fr</variant>
     <variant outdated="yes">ja</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index 86b32747e652c0faf2a08c5c39b2e73a12b7bfaf..f671505fb3d3fd4a000cdbb896d10b9a018156c1 100644 (file)
--- a/docs/manual/mod/core.xml.tr
+++ b/docs/manual/mod/core.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: 1450091 -->
+<!-- English Revision: 1450091:1544630 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
    Reviewed by: Orhan Berent <berent belgeler.gen.tr>

diff --git a/docs/manual/mod/directive-dict.html.en b/docs/manual/mod/directive-dict.html.en
index 5c2ec289271cde6d9be15410242f6aa4ba279183..1df11990636ddf8cd5385d8ce0d2836920247f27 100644 (file)
--- a/docs/manual/mod/directive-dict.html.en
+++ b/docs/manual/mod/directive-dict.html.en
@@ -174,7 +174,7 @@
       <dt>directory</dt>
 
       <dd>A directive marked as being valid in this context may be
-      used inside <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>, <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, and <code class="directive"><a href="../mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code> containers
+      used inside <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>, <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, <code class="directive"><a href="../mod/core.html#if">&lt;If&gt;</a></code>, and <code class="directive"><a href="../mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code> containers
       in the server configuration files, subject to the restrictions
       outlined in <a href="../sections.html">Configuration
       Sections</a>.</dd>

diff --git a/docs/manual/mod/directive-dict.xml.ja b/docs/manual/mod/directive-dict.xml.ja
index 6fb6568d3f90772dc11e6d98002051a8ed286aa0..7f38249405a091d9fd4633aa2fc0d8f13d4b4f94 100644 (file)
--- a/docs/manual/mod/directive-dict.xml.ja
+++ b/docs/manual/mod/directive-dict.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 420990 -->
+<!-- English Revision: 420990:1544630 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/directive-dict.xml.ko b/docs/manual/mod/directive-dict.xml.ko
index 057cfbdb5447065eba853abf254aa29c1227f755..776880d15ee0bf75e3d68fc4a6b3923ac6bba04f 100644 (file)
--- a/docs/manual/mod/directive-dict.xml.ko
+++ b/docs/manual/mod/directive-dict.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:420990 (outdated) -->
+<!-- English Revision: 151408:1544630 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/directive-dict.xml.meta b/docs/manual/mod/directive-dict.xml.meta
index 49ffa15e7fcb6a31a2e3cfaba0e152641ce44d7d..4488a0405869d8e6e34f9709b3a8cf03cd1b2a19 100644 (file)
--- a/docs/manual/mod/directive-dict.xml.meta
+++ b/docs/manual/mod/directive-dict.xml.meta
@@ -9,8 +9,8 @@
   <variants>
     <variant>en</variant>
     <variant>fr</variant>
-    <variant>ja</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/directive-dict.xml.tr b/docs/manual/mod/directive-dict.xml.tr
index 08a133dd5b84763be6ed985db8949998d5ab802f..7d753514eb7961ed442539e98b59fbbb6930e5ac 100644 (file)
--- a/docs/manual/mod/directive-dict.xml.tr
+++ b/docs/manual/mod/directive-dict.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 420990 -->
+<!-- English Revision: 420990:1544630 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en
index 54f426a3cd17d9ed116c4f485ee60edd68913921..984ff717cfe857f4014cc9a44362c37387189182 100644 (file)
--- a/docs/manual/mod/mod_authnz_ldap.html.en
+++ b/docs/manual/mod/mod_authnz_ldap.html.en
@@ -859,6 +859,7 @@ authorization</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td><em>exec:</em> was added in 2.4.6.</td></tr>
 </table>
     <p>A bind password to use in conjunction with the bind DN. Note
     that the bind password is probably sensitive data, and should be

diff --git a/docs/manual/mod/mod_cache.xml.meta b/docs/manual/mod/mod_cache.xml.meta
index 29181a9f4862519cf52c83c01e42fd950e6e795b..92f1aa14034e75eb937f06f0dfbbef25cc4017b6 100644 (file)
--- a/docs/manual/mod/mod_cache.xml.meta
+++ b/docs/manual/mod/mod_cache.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>

diff --git a/docs/manual/mod/mod_headers.xml.meta b/docs/manual/mod/mod_headers.xml.meta
index 1efd7777073f1880807555a8c30f2492d26956c1..8708997ffab8e98f53a97abf3d7053e40a7fe414 100644 (file)
--- a/docs/manual/mod/mod_headers.xml.meta
+++ b/docs/manual/mod/mod_headers.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>

diff --git a/docs/manual/mod/mod_ldap.xml.meta b/docs/manual/mod/mod_ldap.xml.meta
index c8ca841281780c64e086b0b2f9ef461024727a9c..92fe318361b3a39a71c3bd36509d9ad41d35e5a2 100644 (file)
--- a/docs/manual/mod/mod_ldap.xml.meta
+++ b/docs/manual/mod/mod_ldap.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/mod/mod_lua.html.en b/docs/manual/mod/mod_lua.html.en
index 0264de8a1c985171bcf54dd7470737f2e66dd28e..a7636e42923c71ace5565cf1e784ef67fdae22df 100644 (file)
--- a/docs/manual/mod/mod_lua.html.en
+++ b/docs/manual/mod/mod_lua.html.en
@@ -1198,7 +1198,7 @@ end
     <pre class="prettyprint lang-lua">
 function handle(r)
     -- Acquire a database handle
-    local database, err = r:dbacquire("mysql", "server=localhost,user=root,dbname=mydb")
+    local database, err = r:dbacquire("mysql", "server=localhost,user=someuser,pass=somepass,dbname=mydb")
     if not err then
         -- Select some information from it
         local results, err = database:select(r, "SELECT `name`, `age` FROM `people` WHERE 1")

diff --git a/docs/manual/mod/mod_lua.xml.fr b/docs/manual/mod/mod_lua.xml.fr
index f043c365fc0c1071c045ab6e4017ab82934a1e35..e1dd0ce699ffa5b36d1043b1844f73b085f223af 100644 (file)
--- a/docs/manual/mod/mod_lua.xml.fr
+++ b/docs/manual/mod/mod_lua.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1523974 -->
+<!-- English Revision: 1523974:1550685 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/mod/mod_lua.xml.meta b/docs/manual/mod/mod_lua.xml.meta
index b55c7710e95c9f695fe435d176007bdf28716825..8fc1a0efdf34e8b8870065a1ce5d7c523d3f652c 100644 (file)
--- a/docs/manual/mod/mod_lua.xml.meta
+++ b/docs/manual/mod/mod_lua.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/platform/win_compiling.html.en b/docs/manual/platform/win_compiling.html.en
index ffdbe6982a644e0f75964775fb3feff21722206f..c3a0907a74081279959c7d8b0a3ab8692fa5e9f7 100644 (file)
--- a/docs/manual/platform/win_compiling.html.en
+++ b/docs/manual/platform/win_compiling.html.en
@@ -266,7 +266,7 @@
     <ol>
        <li>Download and unpack the Unix source tarball for the latest version.</li>
        <li>Download and unpack the Unix source tarball for latest version of
-        APR-Iconv, place this source in the httpd-2.x.x\srclib\apr-iconv</li>
+        APR, AR-Util and APR-Iconv, place these sources in directories  httpd-2.x.x\srclib\apr, httpd-2.x.x\srclib\apr-util and httpd-2.x.x\srclib\apr-iconv</li>
        <li>Open a Command Prompt and CD to the httpd-2.x.x folder</li>
        <li>Run the line endings conversion utility at the prompt;</li>
     </ol>

diff --git a/docs/manual/platform/win_compiling.xml.ko b/docs/manual/platform/win_compiling.xml.ko
index 302ebc0d77bff9cb461c38333c6ba7950f7adf00..401a8ef7dcecb81fbc2604312760ba79de35200b 100644 (file)
--- a/docs/manual/platform/win_compiling.xml.ko
+++ b/docs/manual/platform/win_compiling.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1542756 (outdated) -->
+<!-- English Revision: 105989:1546439 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/platform/win_compiling.xml.meta b/docs/manual/platform/win_compiling.xml.meta
index d22953fa3aad1906c8c5669b7740ed6badf46707..18023d6aeb4e0f25428e88887e63c588e5c7e53e 100644 (file)
--- a/docs/manual/platform/win_compiling.xml.meta
+++ b/docs/manual/platform/win_compiling.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/platform/windows.xml.meta b/docs/manual/platform/windows.xml.meta
index 166e6d7d314782768f9edab0865cf27fb37cb68f..df994e4ed61aaed8ad63e81ab55cc7c0d6815e7a 100644 (file)
--- a/docs/manual/platform/windows.xml.meta
+++ b/docs/manual/platform/windows.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/programs/configure.html.en b/docs/manual/programs/configure.html.en
index 67ca536a4d94f03036c5d9d004c838f038597892..2b3fb50fee2c160fc3a27d7b1da9cc5d61acf100 100644 (file)
--- a/docs/manual/programs/configure.html.en
+++ b/docs/manual/programs/configure.html.en
@@ -427,16 +427,6 @@
           <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code> directives for all
           built modules can be activated via the configure option
           <code>--enable-load-all-modules</code>.</p>
-          <p><strong>Caveat:</strong>
-          <code>--enable-mods-shared=all</code> does not actually build all
-          modules. To build all modules then, one might use:</p>
-          <div class="example"><p><code>
-            ./configure \<br />
-            <span class="indent">
-                --with-ldap \<br />
-                --enable-mods-shared="all ssl ldap cache proxy authn_alias file_cache authnz_ldap charset_lite dav_lock cache_disk"
-            </span>
-          </code></p></div>
         </dd>
 
         <dt><code>--enable-mods-static=<var>MODULE-LIST</var></code></dt>

diff --git a/docs/manual/programs/configure.xml.ko b/docs/manual/programs/configure.xml.ko
index 3faa8a47e38568bc399f363424c37e86d2c9297b..453b5233a9731163110fd6f214ae1ea18ae70bed 100644 (file)
--- a/docs/manual/programs/configure.xml.ko
+++ b/docs/manual/programs/configure.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1296925 (outdated) -->
+<!-- English Revision: 105989:1545016 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/programs/configure.xml.meta b/docs/manual/programs/configure.xml.meta
index fea21453ebfc11a735b50415933965233cf407eb..64d57955df339b41912b4ef344b525b9a1268265 100644 (file)
--- a/docs/manual/programs/configure.xml.meta
+++ b/docs/manual/programs/configure.xml.meta
@@ -10,6 +10,6 @@
     <variant>en</variant>
     <variant>fr</variant>
     <variant outdated="yes">ko</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/programs/configure.xml.tr b/docs/manual/programs/configure.xml.tr
index 249112b97fa31e71d53cdc8158cc714b7aa2afa4..572da83273b4a50ed4fc9d00a0bea98b7cf2590e 100644 (file)
--- a/docs/manual/programs/configure.xml.tr
+++ b/docs/manual/programs/configure.xml.tr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1296925 -->
+<!-- English Revision: 1296925:1545016 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>

diff --git a/docs/manual/upgrading.xml.meta b/docs/manual/upgrading.xml.meta
index 1d2a68a225aa2d153bd52b089461d6b5ec809b09..aba29996bbd699aa0af1827543fc41d3c2d9af24 100644 (file)
--- a/docs/manual/upgrading.xml.meta
+++ b/docs/manual/upgrading.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
   </variants>
 </metafile>