From: Christophe Jaillet <jailletc36@apache.org>
Date: Sat, 5 Sep 2015 06:36:56 +0000 (+0000)
Subject: rebuild
X-Git-Tag: 2.5.0-alpha~2866
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f11e6bd8318a6c7b360d77bda76bc8072a430d9;p=thirdparty%2Fapache%2Fhttpd.git

rebuild

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

diff --git a/docs/manual/developer/lua.html.en b/docs/manual/developer/lua.html.en
index be39e48b863..f69f1dddb17 100644
--- a/docs/manual/developer/lua.html.en
+++ b/docs/manual/developer/lua.html.en
@@ -81,7 +81,7 @@ that every call to a Lua script will spawn a new Lua state that handles that
 script and is destroyed immediately after. This option keeps the memory
 footprint of mod_lua low, but also affects the processing speed of a request.
 If you have the memory to spare, you can set the scope to <code>thread</code>,
-which will make mod_lua spawn a Lua state that lasts the entirity of a thread's
+which will make mod_lua spawn a Lua state that lasts the entirety of a thread's
 lifetime, speeding up request processing by 2-3 times. Since mod_lua will create
 a state for each script, this may be an expensive move, memory-wise, so to
 compromise between speed and memory usage, you can choose the <code>server</code>
@@ -217,7 +217,7 @@ function remap(r)
     -- browse through the rewrite map
     for key, entry in pairs(map) do
         -- Match source regex against URI
-        local match = apache2.regex(r, entry.source, r.uri) then
+        local match = r:regex(entry.source, r.uri) then
         if match and match[0] then
             r.filename = interpolateString(entry.destination, match)
             -- Is this a proxied remap?
diff --git a/docs/manual/mod/mod_lua.html.en b/docs/manual/mod/mod_lua.html.en
index 3abb015b239..f7c043395b0 100644
--- a/docs/manual/mod/mod_lua.html.en
+++ b/docs/manual/mod/mod_lua.html.en
@@ -165,7 +165,7 @@ function handle(r)
 -- use our own Error contents
         r:puts("Unsupported HTTP method " .. r.method)
         r.status = 405
-        return apache2.ok
+        return apache2.OK
     else
 -- use the ErrorDocument
         return 501
diff --git a/docs/manual/mod/mod_lua.xml.fr b/docs/manual/mod/mod_lua.xml.fr
index ed2c94bcb83..41b5dbc3071 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: 1673945 -->
+<!-- English Revision: 1673945:1701349 (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 b55c7710e95..8fc1a0efdf3 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>