Merge r1300766:

  Fix some typos

No logic change. I think this is CTR, please correct me if I am wrong.

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

diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c
index 614f81dbd1406b344c8ff2f34e79333924f44a66..91bd3b75e600e4ea2bc855e8d8fee6561377ba4e 100644 (file)
--- a/modules/lua/lua_request.c
+++ b/modules/lua/lua_request.c
@@ -82,7 +82,7 @@ void ap_lua_rstack_dump(lua_State *L, request_rec *r, const char *msg)
             }
         default:{
                 ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
-                              "%d:  unkown: -[%s]-", i, lua_typename(L, i));
+                              "%d:  unknown: -[%s]-", i, lua_typename(L, i));
                 break;
             }
         }

diff --git a/modules/lua/lua_vmprep.c b/modules/lua/lua_vmprep.c
index 308ffe60470ce22a4b6b878c29f389e23e8a6fa3..7c383ca94a8b9846cd94c4fab06c6fdef193fba8 100644 (file)
--- a/modules/lua/lua_vmprep.c
+++ b/modules/lua/lua_vmprep.c
@@ -84,7 +84,7 @@ static void pstack_dump(lua_State *L, apr_pool_t *r, int level,
             }
         default:{
                 ap_log_perror(APLOG_MARK, level, 0, r,
-                              "%d:  unkown: [%s]", i, lua_typename(L, i));
+                              "%d:  unknown: [%s]", i, lua_typename(L, i));
                 break;
             }
         }

diff --git a/modules/proxy/ajp_header.c b/modules/proxy/ajp_header.c
index e7e1696996a5e27f4b4b436240ad063cf7d8c60b..dc86defa7ddc961f05126a08fa851be62f3517cf 100644 (file)
--- a/modules/proxy/ajp_header.c
+++ b/modules/proxy/ajp_header.c
@@ -256,7 +256,7 @@ static apr_status_t ajp_marshal_into_msgb(ajp_msg_t *msg,
 
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00968)
                "ajp_marshal_into_msgb: "
-               "Error appending the message begining");
+               "Error appending the message beginning");
         return APR_EGENERAL;
     }
 

diff --git a/server/core.c b/server/core.c
index e96eaa3cd90c94e567dc74c0bc6e0c5a146475ff..a48a0f88865b1c58d269ea418a4b13660ed6a22c 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -4059,7 +4059,7 @@ AP_INIT_TAKE1("MaxConnectionsPerChild", ap_mpm_set_max_requests, NULL, RSRC_CONF
 AP_INIT_TAKE1("CoreDumpDirectory", ap_mpm_set_coredumpdir, NULL, RSRC_CONF,
               "The location of the directory Apache changes to before dumping core"),
 AP_INIT_TAKE1("MaxMemFree", ap_mpm_set_max_mem_free, NULL, RSRC_CONF,
-              "Maximum number of 1k blocks a particular childs allocator may hold."),
+              "Maximum number of 1k blocks a particular child's allocator may hold."),
 AP_INIT_TAKE1("ThreadStackSize", ap_mpm_set_thread_stacksize, NULL, RSRC_CONF,
               "Size in bytes of stack used by threads handling client connections"),
 #if AP_ENABLE_EXCEPTION_HOOK