Merge r1205542:

Make it more explicit that mod_lua may change in 2.4.x

And another blocker is gone.

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

diff --git a/STATUS b/STATUS
index 0c70f7e59a688a355342bd2292613c132b8d13be..04c1e71789853af2abbe2c8acfb95a5164bb34a3 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -94,10 +94,6 @@ RELEASE SHOWSTOPPERS:
     See https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x/docs/STATUS 
     under 'modules docs' for a comprehensive list of undocumented modules.
 
-  * Decide and document the API guarantees for mod_lua. Current consensous at
-    the hackathon seems to be that mod_lua should be released as experimental
-    with a note that the API may change during 2.4.x.
-
   * mod_remoteip works around httpd's non-existent IP address API by leaking
     from c->pool and allowing pointers from r->pool to live beyond r->pool's
     lifetime. Provide an actual API for mod_remoteip to use so these hacks

diff --git a/docs/manual/mod/mod_lua.xml b/docs/manual/mod/mod_lua.xml
index a346d45b39edefd3534430d575f379a9c3843db1..0c51337d8d5e8ca2932de617811052bd107701d2 100644 (file)
--- a/docs/manual/mod/mod_lua.xml
+++ b/docs/manual/mod/mod_lua.xml
@@ -44,7 +44,8 @@ authorization</p>
 
 <note><code>mod_lua</code> is still in experimental state.
 Until it is declared stable, usage and behavior may change
-at any time.</note>
+at any time, even between stable releases of the 2.4.x series.
+Be sure to check the CHANGES file before upgrading.</note>
 
 </summary>