From d90525e92caf1f3efde4ae2f23900ac45841de65 Mon Sep 17 00:00:00 2001
From: Daniel Gruno <humbedooh@apache.org>
Date: Fri, 13 Dec 2013 11:02:59 +0000
Subject: [PATCH] xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1550688 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/core.html.en                |  2 ++
 docs/manual/mod/core.xml.de                 |  2 +-
 docs/manual/mod/core.xml.es                 |  2 +-
 docs/manual/mod/core.xml.ja                 |  2 +-
 docs/manual/mod/core.xml.meta               |  2 +-
 docs/manual/mod/core.xml.tr                 |  2 +-
 docs/manual/mod/directive-dict.html.en      |  2 +-
 docs/manual/mod/directive-dict.xml.ja       |  2 +-
 docs/manual/mod/directive-dict.xml.ko       |  2 +-
 docs/manual/mod/directive-dict.xml.meta     |  4 ++--
 docs/manual/mod/directive-dict.xml.tr       |  2 +-
 docs/manual/mod/mod_authnz_ldap.html.en     |  1 +
 docs/manual/mod/mod_cache.xml.meta          |  2 +-
 docs/manual/mod/mod_headers.xml.meta        |  2 +-
 docs/manual/mod/mod_ldap.xml.meta           |  2 +-
 docs/manual/mod/mod_lua.html.en             |  2 +-
 docs/manual/mod/mod_lua.xml.fr              |  2 +-
 docs/manual/mod/mod_lua.xml.meta            |  2 +-
 docs/manual/platform/win_compiling.html.en  |  2 +-
 docs/manual/platform/win_compiling.xml.ko   |  2 +-
 docs/manual/platform/win_compiling.xml.meta |  2 +-
 docs/manual/platform/windows.xml.meta       |  2 +-
 docs/manual/programs/configure.html.en      | 10 ----------
 docs/manual/programs/configure.xml.ko       |  2 +-
 docs/manual/programs/configure.xml.meta     |  2 +-
 docs/manual/programs/configure.xml.tr       |  2 +-
 docs/manual/upgrading.xml.meta              |  2 +-
 27 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index f394137517..19eaacd499 100644
--- 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 13202a048d..51b262f8aa 100644
--- 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 9daa885aad..97bcf22864 100644
--- 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 c3bdf86dc3..6b248058f3 100644
--- 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 189b445c69..e78755527a 100644
--- 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 86b32747e6..f671505fb3 100644
--- 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 5c2ec28927..1df1199063 100644
--- 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 6fb6568d3f..7f38249405 100644
--- 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 057cfbdb54..776880d15e 100644
--- 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 49ffa15e7f..4488a04058 100644
--- 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 08a133dd5b..7d753514eb 100644
--- 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 54f426a3cd..984ff717cf 100644
--- 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 29181a9f48..92f1aa1403 100644
--- 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 1efd777707..8708997ffa 100644
--- 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 c8ca841281..92fe318361 100644
--- 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 0264de8a1c..a7636e4292 100644
--- 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 f043c365fc..e1dd0ce699 100644
--- 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 b55c7710e9..8fc1a0efdf 100644
--- 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 ffdbe6982a..c3a0907a74 100644
--- 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 302ebc0d77..401a8ef7dc 100644
--- 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 d22953fa3a..18023d6aeb 100644
--- 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 166e6d7d31..df994e4ed6 100644
--- 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 67ca536a4d..2b3fb50fee 100644
--- 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 3faa8a47e3..453b5233a9 100644
--- 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 fea21453eb..64d57955df 100644
--- 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 249112b97f..572da83273 100644
--- 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 1d2a68a225..aba29996bb 100644
--- 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>
-- 
2.50.1