From: Daniel Earl Poirier <poirier@apache.org>
Date: Fri, 30 Apr 2010 15:05:07 +0000 (+0000)
Subject: Change references from mod_wombat to mod_lua.
X-Git-Tag: 2.3.6~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94a86a5c9641dc4b478ca924d7f751b638ac3291;p=thirdparty%2Fapache%2Fhttpd.git

Change references from mod_wombat to mod_lua.
Remove references to no-longer-needed pre-req, mod_apreq2.


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

diff --git a/modules/lua/README b/modules/lua/README
index 855a243e89f..f5fcc3d5324 100644
--- a/modules/lua/README
+++ b/modules/lua/README
@@ -1,9 +1,7 @@
 -*- mode:org -*-
 * Requirements:
 ** lua 5.1 ( http://www.lua.org/ )
-** libapreq2 ( http://httpd.apache.org/apreq/download.cgi )
-   This is no longer a requirement, actually
-** Apache HTTPD 2.2 ( http://httpd.apache.org/ )
+** Apache HTTPD 2.2 ( http://httpd.apache.org/ ) or Apache HTTPD 2.3
 
 * Documentation
   See docs/README
@@ -64,7 +62,7 @@
   See NOTICE file for more information
         
 * Problems and Patches:
-  Please use dev@httpd.apache.org for discussing mod_wombat development
+  Please use dev@httpd.apache.org for discussing mod_lua development
   To subscribe send email to dev-subscribe@httpd.apache.org  
   Note that this is for development discussion, not user support :-)
    
diff --git a/modules/lua/docs/basic-configuration.txt b/modules/lua/docs/basic-configuration.txt
index 5e6a6d31a05..c20983349fb 100644
--- a/modules/lua/docs/basic-configuration.txt
+++ b/modules/lua/docs/basic-configuration.txt
@@ -1,19 +1,17 @@
 See sample_httpd.conf for examples
 
 The basic module loading directive is
-    LoadModule apreq_module modules/mod_apreq2.so
-    LoadModule wombat_module modules/mod_wombat.so
-I included the apreq_module in the example as you need it to :-)
+    LoadModule lua_module modules/mod_lua.so
 
 The handler name is "lua-script" so you can use the normal
 AddHandler directive, such as "AddHandler lua-script .lua" to
-set anything ending in .lua to use mod_wombat to evaluate
+set anything ending in .lua to use mod_lua to evaluate
 
-mod_wombat exports several additional directives:
+mod_lua exports several additional directives:
 
     LuaRoot /path/to/a/directory
         Specify the base path which will be used to evaluate all
-        relative paths within mod_wombat. If not specified they
+        relative paths within mod_lua. If not specified they
         will be resolved relative to the current working directory,
         which may not always work well for a server.
 
diff --git a/modules/lua/docs/running-developer-tests.txt b/modules/lua/docs/running-developer-tests.txt
index e40bf986232..59eb990fc2d 100644
--- a/modules/lua/docs/running-developer-tests.txt
+++ b/modules/lua/docs/running-developer-tests.txt
@@ -1,6 +1,6 @@
 -*- mode:org -*-
-* Building mod_wombat
-  The first step is to build mod_wombat per the instructions in
+* Building mod_lua
+  The first step is to build mod_lua per the instructions in
   building-from-subversion.txt.
 
 * Build and install LuaSocket
diff --git a/modules/lua/docs/writing-handlers.txt b/modules/lua/docs/writing-handlers.txt
index 10cfb5d890a..2f18c4149e4 100644
--- a/modules/lua/docs/writing-handlers.txt
+++ b/modules/lua/docs/writing-handlers.txt
@@ -1,4 +1,4 @@
-mod_wombat always looks to invoke a function for the handler, rather than
+mod_lua always looks to invoke a function for the handler, rather than
 just evaluating a script body CGI style. A handler function looks
 something like this:
 
diff --git a/modules/lua/test/test_httpd.conf b/modules/lua/test/test_httpd.conf
index 7b236ed50c9..27e3a506c97 100755
--- a/modules/lua/test/test_httpd.conf
+++ b/modules/lua/test/test_httpd.conf
@@ -7,8 +7,7 @@ LuaRoot /Users/brianm/src/wombat/test
 
 Listen 8000
 
-LoadModule apreq_module modules/mod_apreq2.so
-LoadModule wombat_module modules/mod_wombat.so
+LoadModule lua_module modules/mod_lua.so
 
 AddHandler lua-script .lua