xforms

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

5 files changed, 13 insertions, 4 deletions

diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en
index 7d1cb3d4bf..fc7706730d 100644
--- a/docs/manual/mod/mod_authz_core.html.en
+++ b/docs/manual/mod/mod_authz_core.html.en
@@ -243,6 +243,15 @@ Alias /secure /webpages/secure
     <pre class="prettyprint lang-config">Require expr "%{TIME_HOUR} -ge 9 &amp;&amp; %{TIME_HOUR} -le 17"</pre>
 
 
+    <pre class="prettyprint lang-config">&lt;RequireAll&gt;
+    Require expr "!(%{QUERY_STRING} =~ /secret/)"
+    Require expr "%{REQUEST_URI} in { '/example.cgi' }" 
+&lt;/RequireAll&gt;</pre>
+
+
+    <pre class="prettyprint lang-config">Require expr "!(%{QUERY_STRING} =~ /secret/) &amp;&amp; %{REQUEST_URI} in { '/example.cgi' }"</pre>
+
+
   <p>The syntax is described in the <a href="../expr.html">ap_expr</a>
   documentation.</p>
 
diff --git a/docs/manual/mod/mod_log_config.xml.ja b/docs/manual/mod/mod_log_config.xml.ja
index 7d39157549..469bb17a90 100644
--- a/docs/manual/mod/mod_log_config.xml.ja
+++ b/docs/manual/mod/mod_log_config.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: 579425:1619884 (outdated) -->
+<!-- English Revision: 579425:1584684 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_log_config.xml.ko b/docs/manual/mod/mod_log_config.xml.ko
index 23c617f687..47be0f4250 100644
--- a/docs/manual/mod/mod_log_config.xml.ko
+++ b/docs/manual/mod/mod_log_config.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: 105989:1619884 (outdated) -->
+<!-- English Revision: 105989:1584684 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_log_config.xml.meta b/docs/manual/mod/mod_log_config.xml.meta
index d4b2d270f9..d3f68096ba 100644
--- a/docs/manual/mod/mod_log_config.xml.meta
+++ b/docs/manual/mod/mod_log_config.xml.meta
@@ -11,6 +11,6 @@
     <variant>fr</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_proxy_fcgi.html.en b/docs/manual/mod/mod_proxy_fcgi.html.en
index 9f4c65135a..e3b5998a55 100644
--- a/docs/manual/mod/mod_proxy_fcgi.html.en
+++ b/docs/manual/mod/mod_proxy_fcgi.html.en
@@ -101,7 +101,7 @@
     <p> The following example passes the request URI as a filesystem
     path for the PHP-FPM daemon to run. In this case, PHP-FPM is listening on
     a unix domain socket (UDS).  Requires 2.4.9 or later. With this syntax,
-    the hostname and optional port following fci:// are ignored.</p>
+    the hostname and optional port following fcgi:// are ignored.</p>
     <div class="example"><h3>PHP-FPM with UDS</h3><pre class="prettyprint lang-config">ProxyPassMatch ^/(.*\.php(/.*)?)$ "unix:/var/run/php5-fpm.sock|fcgi://localhost/var/www/"</pre>
 </div>