diff --git a/VERSIONING b/VERSIONING index 176cdc5d050..eb8f757bce1 100644 --- a/VERSIONING +++ b/VERSIONING @@ -31,7 +31,7 @@ STABLE RELEASES, 2.{even}.{revision} All even numbered releases will be considered stable revisions. -Stable revisions will retain forward compatiblity to the maximum +Stable revisions will retain forward compatibility to the maximum possible extent. Features may be added during minor revisions, and features may be deprecated by making appropriate notations in the documentation, but no features may be removed. @@ -96,7 +96,7 @@ the current stable release. Work proceeds on development releases, permitting the modification of the MMN at any time in order to correct deficiencies or shortcomings in the API. This means that modules from one development release to another may not be binary compatible, or may not successfully -compile without modification to accomodate the API changes. +compile without modification to accommodate the API changes. The only 'supported' development release at any time will be the most recently released version. Developers will not be answering bug reports diff --git a/docs/STATUS b/docs/STATUS index bcaa0f875a2..50d1ac079da 100644 --- a/docs/STATUS +++ b/docs/STATUS @@ -121,7 +121,7 @@ To Do List are accurate, and others are way outdated. - I'd like to expand the discussion of conditional logging, and add a - few more useful exmaples. + few more useful examples. That would be a good place to document logging of cache hit/miss: https://issues.apache.org/bugzilla/show_bug.cgi?id=48241#c2 diff --git a/docs/man/ab.1 b/docs/man/ab.1 index 78f95135201..2291dee5176 100644 --- a/docs/man/ab.1 +++ b/docs/man/ab.1 @@ -80,7 +80,7 @@ Do HEAD requests instead of GET\&. Enable the HTTP KeepAlive feature, \fIi\&.e\&.\fR, perform multiple requests within one HTTP session\&. Default is no KeepAlive\&. .TP -l -Do not report errors if the length of the responses is not constant\&. This can be usefull for dynamic pages\&. +Do not report errors if the length of the responses is not constant\&. This can be useful for dynamic pages\&. .TP -n \fIrequests\fR Number of requests to perform for the benchmarking session\&. The default is to just perform a single request which usually leads to non-representative benchmarking results\&. diff --git a/docs/manual/developer/lua.html.en b/docs/manual/developer/lua.html.en index c5085d9496a..78e833bbf11 100644 --- a/docs/manual/developer/lua.html.en +++ b/docs/manual/developer/lua.html.en @@ -79,7 +79,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 thread, -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 entirily 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 server @@ -466,7 +466,7 @@ end 
--[[ 
      This script has two user groups; members and admins, and whichever 
-     is refered to by the "Require rights" directive is checked to see
+     is referred to by the "Require rights" directive is checked to see
      if the authenticated user belongs to this group.
 ]]--
 
diff --git a/docs/manual/developer/lua.xml b/docs/manual/developer/lua.xml
index 06d9087624a..b0a7ce607cc 100644
--- a/docs/manual/developer/lua.xml
+++ b/docs/manual/developer/lua.xml
@@ -76,7 +76,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 thread, 
-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 entirely 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 server 
@@ -483,7 +483,7 @@ LuaAuthzProvider rights /path/to/lua/script.lua rights_handler
 
 --[[ 
      This script has two user groups; members and admins, and whichever 
-     is refered to by the "Require rights" directive is checked to see
+     is referred to by the "Require rights" directive is checked to see
      if the authenticated user belongs to this group.
 ]]--
 
diff --git a/docs/manual/glossary.html.en b/docs/manual/glossary.html.en
index 38bd1d86b11..f9fb3d9f20d 100644
--- a/docs/manual/glossary.html.en
+++ b/docs/manual/glossary.html.en
@@ -357,7 +357,7 @@
       See: SSL/TLS Encryption
     
 
-    
Regular Expression
+    
Regular Expression
       (Regex)

     
A way of describing a pattern in text - for example, "all the words that
       begin with the letter A" or "every 10-digit phone number" or even "Every
diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml
index f8900d5c7e1..b573059462b 100644
--- a/docs/manual/glossary.xml
+++ b/docs/manual/glossary.xml
@@ -371,7 +371,7 @@
       See: SSL/TLS Encryption
     

 
-    
Regular Expression
+    
Regular Expression
       (Regex)

     
A way of describing a pattern in text - for example, "all the words that
       begin with the letter A" or "every 10-digit phone number" or even "Every
diff --git a/docs/manual/howto/auth.html.en b/docs/manual/howto/auth.html.en
index a1e20528402..c9b221eff91 100644
--- a/docs/manual/howto/auth.html.en
+++ b/docs/manual/howto/auth.html.en
@@ -451,7 +451,7 @@ Require group GroupName
and choosing how authorization will be done is now possible.

Applying logic and ordering

-

Controling how and in what order authorization will be applied +

Controlling how and in what order authorization will be applied has been a bit of a mystery in the past. In Apache 2.2 a provider-based authentication mechanism was introduced to decouple the actual authentication process from authorization and supporting functionality. diff --git a/docs/manual/howto/auth.xml b/docs/manual/howto/auth.xml index 79dc33e0258..beb0610e99f 100644 --- a/docs/manual/howto/auth.xml +++ b/docs/manual/howto/auth.xml @@ -448,7 +448,7 @@ Require group GroupName and choosing how authorization will be done is now possible.

Applying logic and ordering -

Controling how and in what order authorization will be applied +

Controlling how and in what order authorization will be applied has been a bit of a mystery in the past. In Apache 2.2 a provider-based authentication mechanism was introduced to decouple the actual authentication process from authorization and supporting functionality. diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 156210ac8d5..73c9e87ebeb 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -925,7 +925,7 @@ the contents of file-system directories matching a regular expression.

would match directories in /www/ that consisted of three numbers.

-

Compatability

+

Compatibility

Prior to 2.3.9, this directive implicitly applied to sub-directories (like <Directory>) and could not match the end of line symbol ($). In 2.3.9 and later, diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index afafcaa328c..5bd5aa9864a 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -872,7 +872,7 @@ the contents of file-system directories matching a regular expression.would match directories in /www/ that consisted of three numbers.

- Compatability + Compatibility Prior to 2.3.9, this directive implicitly applied to sub-directories (like Directory) and could not match the end of line symbol ($). In 2.3.9 and later, diff --git a/docs/manual/mod/mod_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en index b65d85f0d6f..f62b1fa4195 100644 --- a/docs/manual/mod/mod_authnz_ldap.html.en +++ b/docs/manual/mod/mod_authnz_ldap.html.en @@ -841,7 +841,7 @@ authorization
top

AuthLDAPBindPassword Directive

- + diff --git a/docs/manual/mod/mod_authnz_ldap.xml b/docs/manual/mod/mod_authnz_ldap.xml index de59a0b5292..e3aaee9fbc2 100644 --- a/docs/manual/mod/mod_authnz_ldap.xml +++ b/docs/manual/mod/mod_authnz_ldap.xml @@ -910,7 +910,7 @@ to perform a DN lookup AuthLDAPBindPassword -Password used in conjuction with the bind DN +Password used in conjunction with the bind DN AuthLDAPBindPassword password directory.htaccess diff --git a/docs/manual/mod/mod_cache.html.en b/docs/manual/mod/mod_cache.html.en index 475210558c7..b49686f13f8 100644 --- a/docs/manual/mod/mod_cache.html.en +++ b/docs/manual/mod/mod_cache.html.en @@ -706,10 +706,10 @@ header.
  • /someapplication/image.gif;jsessionid=123456789
  • /someapplication/image.gif?PHPSESSIONID=12345678
    • -

    This causes cachable resources to be stored separately for each session, which +

    This causes cacheable resources to be stored separately for each session, which is often not desired. CacheIgnoreURLSessionIdentifiers lets define a list of identifiers that are removed from the key that is used to identify - an entity in the cache, such that cachable resources are not stored separately for + an entity in the cache, such that cacheable resources are not stored separately for each session.

    CacheIgnoreURLSessionIdentifiers None clears the list of ignored @@ -857,7 +857,7 @@ CacheLock on

    Description:Password used in conjuction with the bind DN
    Description:Password used in conjunction with the bind DN
    Syntax:AuthLDAPBindPassword password
    Context:directory, .htaccess
    Override:AuthConfig
    Module:mod_cache

    The CacheMaxExpire directive specifies the maximum number of - seconds for which cachable HTTP documents will be retained without checking the origin + seconds for which cacheable HTTP documents will be retained without checking the origin server. Thus, documents will be out of date at most this number of seconds. This maximum value is enforced even if an expiry date was supplied with the document.

    @@ -876,7 +876,7 @@ CacheLock on Module:mod_cache

    The CacheMinExpire directive specifies the minimum number of - seconds for which cachable HTTP documents will be retained without checking the origin + seconds for which cacheable HTTP documents will be retained without checking the origin server. This is only used if no valid expire time was supplied with the document.

    diff --git a/docs/manual/mod/mod_cache.xml b/docs/manual/mod/mod_cache.xml index 1284cef8a62..9a8c143be41 100644 --- a/docs/manual/mod/mod_cache.xml +++ b/docs/manual/mod/mod_cache.xml @@ -470,7 +470,7 @@ CacheEnable disk http://.example.org/

    The CacheMaxExpire directive specifies the maximum number of - seconds for which cachable HTTP documents will be retained without checking the origin + seconds for which cacheable HTTP documents will be retained without checking the origin server. Thus, documents will be out of date at most this number of seconds. This maximum value is enforced even if an expiry date was supplied with the document.

    @@ -493,7 +493,7 @@ CacheEnable disk http://.example.org/

    The CacheMinExpire directive specifies the minimum number of - seconds for which cachable HTTP documents will be retained without checking the origin + seconds for which cacheable HTTP documents will be retained without checking the origin server. This is only used if no valid expire time was supplied with the document.

    @@ -723,10 +723,10 @@ LastModified date.
  • /someapplication/image.gif;jsessionid=123456789
  • /someapplication/image.gif?PHPSESSIONID=12345678
    • -

    This causes cachable resources to be stored separately for each session, which +

    This causes cacheable resources to be stored separately for each session, which is often not desired. CacheIgnoreURLSessionIdentifiers lets define a list of identifiers that are removed from the key that is used to identify - an entity in the cache, such that cachable resources are not stored separately for + an entity in the cache, such that cacheable resources are not stored separately for each session.

    CacheIgnoreURLSessionIdentifiers None clears the list of ignored diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en index c7d1b041619..eccee42d0be 100644 --- a/docs/manual/mod/mod_headers.html.en +++ b/docs/manual/mod/mod_headers.html.en @@ -220,7 +220,7 @@ Header merge Cache-Control no-store env=NO_STORE components of the server may have stored their response headers in either the table that corresponds to onsuccess or the table that corresponds to always. "Always" in this context refers to - whether headers you add will be sent during both a successful and unsucessful + whether headers you add will be sent during both a successful and unsuccessful response, but if your action is a function of an existing header, you will have to read on for further complications.

    diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml index 67e23b521f4..fbd3caa5e8c 100644 --- a/docs/manual/mod/mod_headers.xml +++ b/docs/manual/mod/mod_headers.xml @@ -321,7 +321,7 @@ Header merge Cache-Control no-store env=NO_STORE components of the server may have stored their response headers in either the table that corresponds to onsuccess or the table that corresponds to always. "Always" in this context refers to - whether headers you add will be sent during both a successful and unsucessful + whether headers you add will be sent during both a successful and unsuccessful response, but if your action is a function of an existing header, you will have to read on for further complications.

    diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en index 814eaada3f8..58013ae0e88 100644 --- a/docs/manual/mod/mod_ldap.html.en +++ b/docs/manual/mod/mod_ldap.html.en @@ -366,7 +366,7 @@ LDAPTrustedGlobalCert KEY_BASE64 /certs/key1.pem [password]

    Both CA and client certificates may be specified globally (LDAPTrustedGlobalCert) or per-connection (LDAPTrustedClientCert). When any settings are specified per-connection, the global - settings are superceded.

    + settings are superseded.

    The documentation for the SDK claims to support both SSL and STARTTLS, however STARTTLS does not seem to work on all versions diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml index 8cb27f02d93..e38ada77145 100644 --- a/docs/manual/mod/mod_ldap.xml +++ b/docs/manual/mod/mod_ldap.xml @@ -340,7 +340,7 @@ LDAPTrustedGlobalCert KEY_BASE64 /certs/key1.pem [password]

    Both CA and client certificates may be specified globally (LDAPTrustedGlobalCert) or per-connection (LDAPTrustedClientCert). When any settings are specified per-connection, the global - settings are superceded.

    + settings are superseded.

    The documentation for the SDK claims to support both SSL and STARTTLS, however STARTTLS does not seem to work on all versions diff --git a/docs/manual/mod/mod_lua.html.en b/docs/manual/mod/mod_lua.html.en index 83d13c9ef3a..71ceb139a80 100644 --- a/docs/manual/mod/mod_lua.html.en +++ b/docs/manual/mod/mod_lua.html.en @@ -918,10 +918,10 @@ end -- cost: only valid with BCRYPT algorithm (default = 5). -

    r:mkdir(dir [,mode]) -- Creates a directory and sets mode to optional mode paramter.
    +
    r:mkdir(dir [,mode]) -- Creates a directory and sets mode to optional mode parameter.
    -
    r:mkrdir(dir [,mode]) -- Creates directories recursive and sets mode to optional mode paramter.
    +
    r:mkrdir(dir [,mode]) -- Creates directories recursive and sets mode to optional mode parameter.
    r:rmdir(dir) -- Removes a directory.
    @@ -1063,7 +1063,7 @@ local line = r:wsread() 
    function filter(r)
     -- Our first yield is to signal that we are ready to receive buckets.
     -- Before this yield, we can set up our environment, check for conditions,
-    -- and, if we deem it necessary, decline filtering a request alltogether:
+    -- and, if we deem it necessary, decline filtering a request altogether:
     if something_bad then
         return -- This would skip this filter.
     end
diff --git a/docs/manual/mod/mod_lua.xml b/docs/manual/mod/mod_lua.xml
index 6fab8212176..3efd9cd3293 100644
--- a/docs/manual/mod/mod_lua.xml
+++ b/docs/manual/mod/mod_lua.xml
@@ -934,11 +934,11 @@ r:htpassword(string [,algorithm [,cost]]) -- Creates a password hash from a stri
 
 
 
-r:mkdir(dir [,mode]) -- Creates a directory and sets mode to optional mode paramter.
+r:mkdir(dir [,mode]) -- Creates a directory and sets mode to optional mode parameter.
 
 
 
-r:mkrdir(dir [,mode]) -- Creates directories recursive and sets mode to optional mode paramter.
+r:mkrdir(dir [,mode]) -- Creates directories recursive and sets mode to optional mode parameter.
 
 
 
@@ -1093,7 +1093,7 @@ local line = r:wsread()
 function filter(r)
     -- Our first yield is to signal that we are ready to receive buckets.
     -- Before this yield, we can set up our environment, check for conditions,
-    -- and, if we deem it necessary, decline filtering a request alltogether:
+    -- and, if we deem it necessary, decline filtering a request altogether:
     if something_bad then
         return -- This would skip this filter.
     end
diff --git a/docs/manual/mod/mod_speling.html.en b/docs/manual/mod/mod_speling.html.en
index 1ace2e6b580..c3946399ae8 100644
--- a/docs/manual/mod/mod_speling.html.en
+++ b/docs/manual/mod/mod_speling.html.en
@@ -77,7 +77,7 @@ misspellings.
 
    CheckBasenameMatch Directive
    
 
diff --git a/docs/manual/mod/mod_speling.xml b/docs/manual/mod/mod_speling.xml
index e88916abe8a..ca42bc5c64b 100644
--- a/docs/manual/mod/mod_speling.xml
+++ b/docs/manual/mod/mod_speling.xml
@@ -136,7 +136,7 @@ module
 CheckBasenameMatch
 Extend the action of the speling module to also check filename
-without paying attention to the extention. (e.g. foo.gif and foo.jpg).
+without paying attention to the extension. (e.g. foo.gif and foo.jpg).
 This can be particulary useful in conjunction with
 MultiViews
 CheckBasenameMatch on|off
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index cf05da82a85..613e31c88cd 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -197,7 +197,7 @@ of user groups for authorization
 authorization
 
-
+
@@ -335,7 +335,7 @@ scripts
diff --git a/docs/manual/programs/ab.html.en b/docs/manual/programs/ab.html.en
index ad23c058723..cd7e2cd9a7f 100644
--- a/docs/manual/programs/ab.html.en
+++ b/docs/manual/programs/ab.html.en
@@ -135,7 +135,7 @@
 
     
    -l
    Do not report errors if the length of the responses is not constant. This 
-    can be usefull for dynamic pages.
+    can be useful for dynamic pages.
     
    -n requests
    
diff --git a/docs/manual/programs/ab.xml b/docs/manual/programs/ab.xml
index 640b1321933..4862017919d 100644
--- a/docs/manual/programs/ab.xml
+++ b/docs/manual/programs/ab.xml
@@ -130,7 +130,7 @@
 
     
    -l
    Do not report errors if the length of the responses is not constant. This 
-    can be usefull for dynamic pages.
+    can be useful for dynamic pages.
     
    -n requests
    
diff --git a/docs/manual/rewrite/advanced.html.en b/docs/manual/rewrite/advanced.html.en
index 16a20dad527..69f6c31f81c 100644
--- a/docs/manual/rewrite/advanced.html.en
+++ b/docs/manual/rewrite/advanced.html.en
@@ -35,7 +35,7 @@ them, rather than merely cutting and pasting the examples into your
 configuration.
-
    top
    
-
    URL-based sharding accross multiple backends
    
+
    URL-based sharding across multiple backends
    
 
   
 
diff --git a/docs/manual/rewrite/advanced.xml b/docs/manual/rewrite/advanced.xml
index 99c986a8582..45025f4b4e0 100644
--- a/docs/manual/rewrite/advanced.xml
+++ b/docs/manual/rewrite/advanced.xml
@@ -49,7 +49,7 @@ configuration.
 
 
    
 
-  URL-based sharding accross multiple backends
+  URL-based sharding across multiple backends
 
   
    
     
    Description:
    
diff --git a/docs/manual/socache.html.en b/docs/manual/socache.html.en
index 2f096f9b806..3ae36942f27 100644
--- a/docs/manual/socache.html.en
+++ b/docs/manual/socache.html.en
@@ -68,7 +68,7 @@
       
    const char *create(ap_socache_instance_t **instance, const char *arg,
                           apr_pool_t *tmp, apr_pool_t *p);
    
       
    Create a session cache based on the given configuration string.
-      The instance pointer returned in the instance paramater will be
+      The instance pointer returned in the instance parameter will be
       passed as the first argument to subsequent invocations.
    
 
       
    apr_status_t init(ap_socache_instance_t *instance, const char *cname,
diff --git a/docs/manual/socache.xml b/docs/manual/socache.xml
index 70daaa26146..9a1ec57621e 100644
--- a/docs/manual/socache.xml
+++ b/docs/manual/socache.xml
@@ -67,7 +67,7 @@
       
    const char *create(ap_socache_instance_t **instance, const char *arg,
                           apr_pool_t *tmp, apr_pool_t *p);
    
       
    Create a session cache based on the given configuration string.
-      The instance pointer returned in the instance paramater will be
+      The instance pointer returned in the instance parameter will be
       passed as the first argument to subsequent invocations.
    
 
       
    apr_status_t init(ap_socache_instance_t *instance, const char *cname,
diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index f8da447ebac..b3f231e7a30 100644
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -1228,7 +1228,7 @@ if (typeof(prettyPrint) !== 'undefined') {
 
 
 
-
+
 
 
 
diff --git a/include/apreq_util.h b/include/apreq_util.h
index c8708f41d2f..58d57a16c8d 100644
--- a/include/apreq_util.h
+++ b/include/apreq_util.h
@@ -158,7 +158,7 @@ APREQ_DECLARE(apreq_charset_t) apreq_charset_divine(const char *src,
  * @return ::APREQ_ERROR_BADSEQ or ::APREQ_ERROR_BADCHAR on malformed input.
  *
  * @remarks In the non-success case, dlen will be set to include
- *          the last succesfully decoded value.  This function decodes
+ *          the last successfully decoded value.  This function decodes
  *          \%uXXXX into a utf8 (wide) character, following ECMA-262
  *          (the Javascript spec) Section B.2.1.
  */
@@ -181,7 +181,7 @@ APREQ_DECLARE(apr_status_t) apreq_decode(char *dest, apr_size_t *dlen,
  * @return ::APREQ_ERROR_BADSEQ or ::APREQ_ERROR_BADCHAR on malformed input.
  *
  * @remarks In the non-APR_SUCCESS case, dlen will be set to include
- *          the last succesfully decoded value.  This function decodes
+ *          the last successfully decoded value.  This function decodes
  *          \%uXXXX into a utf8 (wide) character, following ECMA-262
  *          (the Javascript spec) Section B.2.1.
  */
diff --git a/include/http_config.h b/include/http_config.h
index da3b4a2dace..234c2c448fb 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -812,7 +812,7 @@ AP_DECLARE(apr_status_t) ap_cfg_getc(char *ch, ap_configfile_t *cfp);
 /**
  * Detach from open ap_configfile_t, calling the close handler
  * @param cfp The file to close
- * @return 1 on sucess, 0 on failure
+ * @return 1 on success, 0 on failure
  */
 AP_DECLARE(int) ap_cfg_closefile(ap_configfile_t *cfp);
 
diff --git a/include/http_request.h b/include/http_request.h
index 2317826f3a0..5ea0e1fc2e1 100644
--- a/include/http_request.h
+++ b/include/http_request.h
@@ -216,7 +216,7 @@ AP_DECLARE(void) ap_clear_auth_internal(void);
  * Determine whether access control hooks will be run for all internal
  * requests with URIs distinct from that of the initial request, or only
  * those for which different configurations apply than those which applied
- * to the initial request.  To accomodate legacy external modules which
+ * to the initial request.  To accommodate legacy external modules which
  * may expect access control hooks to be run for all internal requests
  * with distinct URIs, this is the default behaviour unless all access
  * control hooks and authentication and authorization providers are
diff --git a/include/httpd.h b/include/httpd.h
index 228b81f1725..d7c2c9f2aeb 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -350,7 +350,7 @@ extern "C" {
  * use by modules.  The difference between #AP_DECLARE and
  * #AP_DECLARE_NONSTD is that the latter is required for any functions
  * which use varargs or are used via indirect function call.  This
- * is to accomodate the two calling conventions in windows dlls.
+ * is to accommodate the two calling conventions in windows dlls.
  */
 # define AP_DECLARE_NONSTD(type)    type
 #endif
diff --git a/include/util_fcgi.h b/include/util_fcgi.h
index 849fdee9c3d..66af75aa73b 100644
--- a/include/util_fcgi.h
+++ b/include/util_fcgi.h
@@ -16,7 +16,7 @@
 
 /**
  * @file  util_fcgi.h
- * @brief FastCGI protocol defitions and support routines
+ * @brief FastCGI protocol definitions and support routines
  *
  * @defgroup APACHE_CORE_FASTCGI FastCGI Tools
  * @ingroup  APACHE_CORE
diff --git a/include/util_ldap.h b/include/util_ldap.h
index 1dc0ee2bd16..1511a9a81cb 100644
--- a/include/util_ldap.h
+++ b/include/util_ldap.h
@@ -253,7 +253,7 @@ APR_DECLARE_OPTIONAL_FN(util_ldap_connection_t *,uldap_connection_find,(request_
  * @param dn The first DN to compare.
  * @param reqdn The DN to compare the first DN to.
  * @param compare_dn_on_server Flag to determine whether the DNs should be checked using
- *                             LDAP calls or with a direct string comparision. A direct
+ *                             LDAP calls or with a direct string comparison. A direct
  *                             string comparison is faster, but not as accurate - false
  *                             negative comparisons are possible.
  * @tip Two DNs can be equal and still fail a string comparison. Eg "dc=example,dc=com"
diff --git a/modules/NWGNUmakefile b/modules/NWGNUmakefile
index 0cc2abdefd0..c07178809de 100644
--- a/modules/NWGNUmakefile
+++ b/modules/NWGNUmakefile
@@ -21,7 +21,7 @@ endif
 endif
 endif
 
-# If USE_STDSOCKETS is defined we allways build mod_ssl
+# If USE_STDSOCKETS is defined we always build mod_ssl
 ifdef USE_STDSOCKETS
 WITH_SSL = 1
 endif
diff --git a/modules/aaa/mod_auth_basic.c b/modules/aaa/mod_auth_basic.c
index 4c04ae496ba..680c215ba85 100644
--- a/modules/aaa/mod_auth_basic.c
+++ b/modules/aaa/mod_auth_basic.c
@@ -385,7 +385,7 @@ static int authenticate_basic_user(request_rec *r)
 
         apr_table_unset(r->notes, AUTHN_PROVIDER_NAME_NOTE);
 
-        /* Something occured. Stop checking. */
+        /* Something occurred. Stop checking. */
         if (auth_result != AUTH_USER_NOT_FOUND) {
             break;
         }
diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index 316da194168..cd191c3049f 100644
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -1299,7 +1299,7 @@ static authn_status get_hash(request_rec *r, const char *user,
 
         apr_table_unset(r->notes, AUTHN_PROVIDER_NAME_NOTE);
 
-        /* Something occured.  Stop checking. */
+        /* Something occurred.  Stop checking. */
         if (auth_result != AUTH_USER_NOT_FOUND) {
             break;
         }
diff --git a/modules/aaa/mod_auth_form.c b/modules/aaa/mod_auth_form.c
index e72857a6a70..483101ea730 100644
--- a/modules/aaa/mod_auth_form.c
+++ b/modules/aaa/mod_auth_form.c
@@ -798,7 +798,7 @@ static int check_authn(request_rec * r, const char *sent_user, const char *sent_
 
         apr_table_unset(r->notes, AUTHN_PROVIDER_NAME_NOTE);
 
-        /* Something occured. Stop checking. */
+        /* Something occurred. Stop checking. */
         if (auth_result != AUTH_USER_NOT_FOUND) {
             break;
         }
diff --git a/modules/aaa/mod_authz_groupfile.c b/modules/aaa/mod_authz_groupfile.c
index 261f2fb40f7..2f760903b56 100644
--- a/modules/aaa/mod_authz_groupfile.c
+++ b/modules/aaa/mod_authz_groupfile.c
@@ -18,7 +18,7 @@
  *
  *          AuthGroupFile standard /path/to/file
  *
- * and the presense of a
+ * and the presence of a
  *
  *         require group 
  *
diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index 801c7deabe6..43608c6ca12 100644
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -27,7 +27,7 @@
  * It is a complete implementation of the ISAPI 2.0 specification,
  * except for "Microsoft extensions" to the API which provide
  * asynchronous I/O.  It is further extended to include additional
- * "Microsoft extentions" through IIS 5.0, with some deficiencies
+ * "Microsoft extensions" through IIS 5.0, with some deficiencies
  * where one-to-one mappings don't exist.
  *
  * Refer to /manual/mod/mod_isapi.html for additional details on
@@ -152,7 +152,7 @@ static const char *isapi_cmd_cachefile(cmd_parms *cmd, void *dummy,
         return NULL;
     }
 
-    /* Load the extention as cached (with null request_rec) */
+    /* Load the extension as cached (with null request_rec) */
     rv = isapi_lookup(cmd->pool, cmd->server, NULL, fspec, &isa);
     if (rv != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, rv, cmd->server, APLOGNO(02106)
diff --git a/modules/core/mod_macro.c b/modules/core/mod_macro.c
index 831769999ed..dbc89f616e7 100644
--- a/modules/core/mod_macro.c
+++ b/modules/core/mod_macro.c
@@ -387,7 +387,7 @@ static char *substitute(char *buf,
 }
 
 /*
-  find first occurence of args in buf.
+  find first occurrence of args in buf.
   in case of conflict, the LONGEST argument is kept. (could be the FIRST?).
   returns the pointer and the whichone found, or NULL.
 */
diff --git a/modules/core/mod_so.c b/modules/core/mod_so.c
index 6df596a9009..2378ac5e5e7 100644
--- a/modules/core/mod_so.c
+++ b/modules/core/mod_so.c
@@ -193,7 +193,7 @@ static const char *load_module(cmd_parms *cmd, void *dummy,
     const char *error;
 
     /* we need to setup this value for dummy to make sure that we don't try
-     * to add a non-existant tree into the build when we return to
+     * to add a non-existent tree into the build when we return to
      * execute_now.
      */
     *(ap_directive_t **)dummy = NULL;
diff --git a/modules/core/test/conf/test30.conf b/modules/core/test/conf/test30.conf
index 72b2bb2c99d..671766c9e70 100755
--- a/modules/core/test/conf/test30.conf
+++ b/modules/core/test/conf/test30.conf
@@ -1,4 +1,4 @@
-# name conficts: the longest is chosen
+# name conflicts: the longest is chosen
 # also test a parametric section
 
 
diff --git a/modules/dav/fs/lock.c b/modules/dav/fs/lock.c
index 052eafec939..2126b3189d1 100644
--- a/modules/dav/fs/lock.c
+++ b/modules/dav/fs/lock.c
@@ -951,7 +951,7 @@ static dav_error * dav_fs_add_locknull_state(
 
 /*
 ** dav_fs_remove_locknull_state:  Given a request, check to see if r->filename
-**    is/was a lock-null resource.  If so, return it to an existant state, i.e.
+**    is/was a lock-null resource.  If so, return it to an existent state, i.e.
 **    remove it from the list in the appropriate .DAV/locknull file.
 */
 static dav_error * dav_fs_remove_locknull_state(
diff --git a/modules/dav/fs/repos.c b/modules/dav/fs/repos.c
index ae6f5c0ea16..e1879798d0f 100644
--- a/modules/dav/fs/repos.c
+++ b/modules/dav/fs/repos.c
@@ -1675,7 +1675,7 @@ static dav_error * dav_fs_walker(dav_fs_walker_context *fsctx, int depth)
         /* put a slash back on the end of the directory */
         fsctx->path1.buf[fsctx->path1.cur_len - 1] = '/';
 
-        /* these are all non-existant (files) */
+        /* these are all non-existent (files) */
         fsctx->res1.exists = 0;
         fsctx->res1.collection = 0;
         memset(&fsctx->info1.finfo, 0, sizeof(fsctx->info1.finfo));
diff --git a/modules/dav/main/mod_dav.h b/modules/dav/main/mod_dav.h
index 62c21f057f3..6dc49ca03bd 100644
--- a/modules/dav/main/mod_dav.h
+++ b/modules/dav/main/mod_dav.h
@@ -416,7 +416,7 @@ typedef struct dav_locktoken dav_locktoken;
 ** the sub-pools are a bit more general and heavyweight than these buffers.
 */
 
-/* buffer for reuse; can grow to accomodate needed size */
+/* buffer for reuse; can grow to accommodate needed size */
 typedef struct
 {
     apr_size_t alloc_len;       /* how much has been allocated */
@@ -434,7 +434,7 @@ DAV_DECLARE(void) dav_set_bufsize(apr_pool_t *p, dav_buffer *pbuf,
 DAV_DECLARE(void) dav_buffer_init(apr_pool_t *p, dav_buffer *pbuf,
                                   const char *str);
 
-/* check that the buffer can accomodate  more bytes */
+/* check that the buffer can accommodate  more bytes */
 DAV_DECLARE(void) dav_check_bufsize(apr_pool_t *p, dav_buffer *pbuf,
                                     apr_size_t extra_needed);
 
@@ -864,7 +864,7 @@ struct dav_hooks_liveprop
 **
 ** This structure is used as a standard way to determine if a particular
 ** property is a live property. Its use is not part of the mandated liveprop
-** interface, but can be used by liveprop providers in conjuction with the
+** interface, but can be used by liveprop providers in conjunction with the
 ** utility routines below.
 **
 ** spec->name == NULL is the defined end-sentinel for a list of specs.
@@ -2311,7 +2311,7 @@ struct dav_hooks_vsn
     ** exist. Any  element is passed to the provider
     ** in the "doc" structure; it may be empty.
     **
-    ** If workspace creation is succesful, the state of the resource
+    ** If workspace creation is successful, the state of the resource
     ** object is updated appropriately.
     **
     ** This hook is optional; if the provider does not support workspaces,
@@ -2334,7 +2334,7 @@ struct dav_hooks_vsn
     ** Create an activity resource. The resource must not already
     ** exist.
     **
-    ** If activity creation is succesful, the state of the resource
+    ** If activity creation is successful, the state of the resource
     ** object is updated appropriately.
     **
     ** This hook is optional; if the provider does not support activities,
diff --git a/modules/dav/main/util.c b/modules/dav/main/util.c
index 4e85a04f067..50a48f125e5 100644
--- a/modules/dav/main/util.c
+++ b/modules/dav/main/util.c
@@ -587,7 +587,7 @@ static dav_error * dav_add_if_state(apr_pool_t *p, dav_if_header *ih,
 }
 
 /* fetch_next_token returns the substring from str+1
- * to the next occurence of char term, or \0, whichever
+ * to the next occurrence of char term, or \0, whichever
  * occurs first.  Leading whitespace is ignored.
  */
 static char *dav_fetch_next_token(char **str, char term)
@@ -1753,7 +1753,7 @@ DAV_DECLARE(dav_error *) dav_get_locktoken_list(request_rec *r,
     }
 
     while (if_header != NULL) {
-        if_state = if_header->state;        /* Begining of the if_state linked list */
+        if_state = if_header->state;        /* Beginning of the if_state linked list */
         while (if_state != NULL)        {
             if (if_state->condition == DAV_IF_COND_NORMAL
                 && if_state->type == dav_if_opaquelock) {
diff --git a/modules/examples/README b/modules/examples/README
index 02b1c919ede..2e03362aeb2 100644
--- a/modules/examples/README
+++ b/modules/examples/README
@@ -32,7 +32,7 @@ For windows, the process is slightly different;
 
     A. copy modules\examples\mod_example_hooks.c modules\examples\mod_myexample.c
     B. copy modules\examples\mod_example_hooks.dsp modules\examples\mod_myexample.dsp
-    C. replace the occurances of 'example_hooks' with your module name.
+    C. replace the occurrences of 'example_hooks' with your module name.
     D. add the new .dsp to your Apache.dsw workspace, with dependencies
        on the libapr, libaprutil and libhttpd projects.  With the newer
        Developer Studio 2002 through 2005, when you add the new .dsp
diff --git a/modules/filters/mod_sed.c b/modules/filters/mod_sed.c
index dd776c48786..89c02da82a7 100644
--- a/modules/filters/mod_sed.c
+++ b/modules/filters/mod_sed.c
@@ -424,7 +424,7 @@ static apr_status_t sed_request_filter(ap_filter_t *f,
      * the buckets in bbinp and read the data from buckets and invoke
      * sed_eval_buffer on the data. libsed will generate its output using
      * sed_write_output which will add data in ctx->bb. Do it until it have
-     * atleast one bucket bucket in ctx->bb. At the end of data eos bucket
+     * at least one bucket bucket in ctx->bb. At the end of data eos bucket
      * should be there.
      *
      * Once eos bucket is seen, then invoke sed_finalize_eval to clear the
diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
index dc3220e3449..e5cddb44b8b 100644
--- a/modules/http/http_filters.c
+++ b/modules/http/http_filters.c
@@ -1225,7 +1225,7 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter(ap_filter_t *f,
     }
 
     /*
-     * Control cachability for non-cachable responses if not already set by
+     * Control cachability for non-cacheable responses if not already set by
      * some other part of the server configuration.
      */
     if (r->no_cache && !apr_table_get(r->headers_out, "Expires")) {
diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 796d506e841..b12ce2fc2af 100644
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -632,7 +632,7 @@ AP_DECLARE(void) ap_internal_redirect(const char *new_uri, request_rec *r)
 
     AP_INTERNAL_REDIRECT(r->uri, new_uri);
 
-    /* ap_die was already called, if an error occured */
+    /* ap_die was already called, if an error occurred */
     if (!new) {
         return;
     }
@@ -661,7 +661,7 @@ AP_DECLARE(void) ap_internal_redirect_handler(const char *new_uri, request_rec *
     int access_status;
     request_rec *new = internal_internal_redirect(new_uri, r);
 
-    /* ap_die was already called, if an error occured */
+    /* ap_die was already called, if an error occurred */
     if (!new) {
         return;
     }
diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c
index 652ba4013d4..09912945c3a 100644
--- a/modules/lua/lua_request.c
+++ b/modules/lua/lua_request.c
@@ -513,7 +513,7 @@ static int req_ssl_var_lookup(lua_State *L)
     return 1;
 }
 
-/* BEGIN dispatch mathods for request_rec fields */
+/* BEGIN dispatch methods for request_rec fields */
 
 /* not really a field, but we treat it like one */
 static const char *req_document_root(request_rec *r)
diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c
index db1275a1b7f..f6db3225a56 100644
--- a/modules/lua/mod_lua.c
+++ b/modules/lua/mod_lua.c
@@ -643,7 +643,7 @@ static apr_status_t lua_input_filter_handle(ap_filter_t *f,
 }
 
 
-/* ---------------- Configury stuff --------------- */
+/* ---------------- Configure stuff --------------- */
 
 /** harnesses for magic hooks **/
 
diff --git a/modules/mappers/mod_actions.c b/modules/mappers/mod_actions.c
index c311a3bef49..2a67a2742ae 100644
--- a/modules/mappers/mod_actions.c
+++ b/modules/mappers/mod_actions.c
@@ -118,7 +118,7 @@ static const char *set_script(cmd_parms *cmd, void *m_v,
     }
     else {
         /* ap_method_register recognizes already registered methods,
-         * so don't bother to check its previous existence explicitely.
+         * so don't bother to check its previous existence explicitly.
          */
         methnum = ap_method_register(cmd->pool, method);
     }
diff --git a/modules/mappers/mod_imagemap.c b/modules/mappers/mod_imagemap.c
index 65b9eb15d2a..3b856f310dd 100644
--- a/modules/mappers/mod_imagemap.c
+++ b/modules/mappers/mod_imagemap.c
@@ -864,7 +864,7 @@ static int imap_handler_internal(request_rec *r)
         /* There's not much else we can do ... we've already sent the headers
          * to the client.
          */
-        ap_rputs("\n\n[an internal server error occured]\n", r);
+        ap_rputs("\n\n[an internal server error occurred]\n", r);
         menu_footer(r);
         return OK;
     }
diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index 85650bf0b34..0dbadb22ad7 100644
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -2788,7 +2788,7 @@ static int setup_choice_response(request_rec *r, negotiation_state *neg,
      * see that Vary header yet at this point in the control flow.
      * This won't cause any cache consistency problems _unless_ the
      * CGI script also returns a Cache-Control header marking the
-     * response as cachable.  This needs to be fixed, also there are
+     * response as cacheable.  This needs to be fixed, also there are
      * problems if a CGI returns an Etag header which also need to be
      * fixed.
      */
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 7122cb425d3..66ebb8ced10 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -4821,7 +4821,7 @@ static int hook_fixup(request_rec *r)
 
     /*
      *  Do the Options check after engine check, so
-     *  the user is able to explicitely turn RewriteEngine Off.
+     *  the user is able to explicitly turn RewriteEngine Off.
      */
     if (!(ap_allow_options(r) & (OPT_SYM_LINKS | OPT_SYM_OWNER))) {
         /* FollowSymLinks is mandatory! */
diff --git a/modules/metadata/mod_env.c b/modules/metadata/mod_env.c
index 5a98c801f38..e3e1d4e0610 100644
--- a/modules/metadata/mod_env.c
+++ b/modules/metadata/mod_env.c
@@ -63,7 +63,7 @@ static void *merge_env_dir_configs(apr_pool_t *p, void *basev, void *addv)
      *     table_set( res->vars, $element.key, $element.val );
      *
      * add->unsetenv already removed the vars from add->vars,
-     * if they preceeded the UnsetEnv directive.
+     * if they preceded the UnsetEnv directive.
      */
     res->vars = apr_table_copy(p, base->vars);
     res->unsetenv = NULL;
diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c
index 2fba0cd4de3..c12529acfa1 100644
--- a/modules/metadata/mod_mime_magic.c
+++ b/modules/metadata/mod_mime_magic.c
@@ -161,7 +161,7 @@ struct magic {
         unsigned char hl[4];   /* 2 bytes of a fixed-endian "long" */
     } value;                   /* either number or string */
     unsigned long mask;        /* mask before comparison with value */
-    char nospflag;             /* supress space character */
+    char nospflag;             /* suppress space character */
 
     /* NOTE: this string is suspected of overrunning - find it! */
     char desc[MAXDESC];        /* description */
diff --git a/modules/metadata/mod_version.c b/modules/metadata/mod_version.c
index 7bf369bc3a7..688cd8df27f 100644
--- a/modules/metadata/mod_version.c
+++ b/modules/metadata/mod_version.c
@@ -49,7 +49,7 @@
  * = / ==       match; regex must be surrounded by slashes
  * ~            match; regex MAY NOT be surrounded by slashes
  *
- * Note that all operators may be preceeded by an exclamation mark
+ * Note that all operators may be preceded by an exclamation mark
  * (without spaces) in order to reverse their meaning.
  *
  */
diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index 1c6b00b74e1..05b7625cae5 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -866,7 +866,7 @@ int ap_proxy_http_request(apr_pool_t *p, request_rec *r,
      * To reduce server resource use,   setenv proxy-sendchunked
      *
      * Then address specific servers with conditional setenv
-     * options to restore the default behavior where desireable.
+     * options to restore the default behavior where desirable.
      *
      * We have to compute content length by reading the entire request
      * body; if request body is not small, we'll spool the remaining
@@ -1403,7 +1403,7 @@ int ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
 
             /* read the headers. */
             /* N.B. for HTTP/1.0 clients, we have to fold line-wrapped headers*/
-            /* Also, take care with headers with multiple occurences. */
+            /* Also, take care with headers with multiple occurrences. */
 
             /* First, tuck away all already existing cookies */
             save_table = apr_table_make(r->pool, 2);
@@ -1452,7 +1452,7 @@ int ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
                  *
                  * To help mitigate HTTP Splitting, unset Content-Length
                  * and shut down the backend server connection
-                 * XXX: We aught to treat such a response as uncachable
+                 * XXX: We aught to treat such a response as uncacheable
                  */
                 apr_table_unset(r->headers_out, "Content-Length");
                 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01107)
diff --git a/modules/proxy/mod_serf.h b/modules/proxy/mod_serf.h
index 39fb541b301..cab6da5572b 100644
--- a/modules/proxy/mod_serf.h
+++ b/modules/proxy/mod_serf.h
@@ -77,7 +77,7 @@ struct ap_serf_cluster_provider_t {
      * unable to contact any of the servers, a 502 will be returned to the
      * client.
      *
-     * Returns OK on sucess, all other return codes will result in a 500.
+     * Returns OK on success, all other return codes will result in a 500.
      *
      * This field must be set.
      */
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 23dfba334b4..214a162babb 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1790,13 +1790,13 @@ PROXY_DECLARE(apr_status_t) ap_proxy_initialize_worker(proxy_worker *worker, ser
             if (worker->s->smax == -1 || worker->s->smax > worker->s->hmax) {
                 worker->s->smax = worker->s->hmax;
             }
-            /* Set min to be lower then smax */
+            /* Set min to be lower than smax */
             if (worker->s->min > worker->s->smax) {
                 worker->s->min = worker->s->smax;
             }
         }
         else {
-            /* This will supress the apr_reslist creation */
+            /* This will suppress the apr_reslist creation */
             worker->s->min = worker->s->smax = worker->s->hmax = 0;
         }
     }
diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index b6b860d4f58..3bd1cd1c42f 100644
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -743,7 +743,7 @@ static apr_status_t ssl_init_ctx_cert_chain(server_rec *s,
      * SSLCACertificateFile and also use client authentication mod_ssl
      * would accept all clients also issued by this CA. Obviously this
      * isn't what we want in this situation. So this feature here exists
-     * to allow one to explicity configure CA certificates which are
+     * to allow one to explicitly configure CA certificates which are
      * used only for the server certificate chain.
      */
     if (!chain) {
diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index 922bf7c11fc..e366a544dc6 100644
--- a/modules/ssl/ssl_engine_vars.c
+++ b/modules/ssl/ssl_engine_vars.c
@@ -927,7 +927,7 @@ apr_array_header_t *ssl_ext_list(apr_pool_t *p, conn_rec *c, int peer,
     }
 
     count = X509_get_ext_count(xs);
-    /* Create an array large enough to accomodate every extension. This is
+    /* Create an array large enough to accommodate every extension. This is
      * likely overkill, but safe.
      */
     array = apr_array_make(p, count, sizeof(char *));
diff --git a/os/netware/pre_nw.h b/os/netware/pre_nw.h
index dcb1145e486..eef1f6f10b2 100644
--- a/os/netware/pre_nw.h
+++ b/os/netware/pre_nw.h
@@ -55,7 +55,7 @@
 #endif
 #endif
 
-/* C9X defintion used by MSL C++ library */
+/* C9X definition used by MSL C++ library */
 #define DECIMAL_DIG 17
 
 /* some code may want to use the MS convention for long long */
diff --git a/server/apreq_cookie.c b/server/apreq_cookie.c
index 585482c68a6..53ae16f64d6 100644
--- a/server/apreq_cookie.c
+++ b/server/apreq_cookie.c
@@ -429,7 +429,7 @@ APREQ_DECLARE(apr_status_t)apreq_parse_cookie_header(apr_pool_t *p,
 APREQ_DECLARE(int) apreq_cookie_serialize(const apreq_cookie_t *c,
                                           char *buf, apr_size_t len)
 {
-    /*  The format string must be large enough to accomodate all
+    /*  The format string must be large enough to accommodate all
      *  of the cookie attributes.  The current attributes sum to
      *  ~90 characters (w/ 6-8 padding chars per attr), so anything
      *  over 100 should be fine.
diff --git a/server/apreq_module_cgi.c b/server/apreq_module_cgi.c
index 1c8fbfa88cf..eab8a604163 100644
--- a/server/apreq_module_cgi.c
+++ b/server/apreq_module_cgi.c
@@ -42,7 +42,7 @@
 
 /** Interactive patch:
  * TODO Don't use 65K buffer
- * TODO Handle empty/non-existant parameters
+ * TODO Handle empty/non-existent parameters
  * TODO Allow body elements to be files
  * TODO When running body/get/cookies all at once, include previous cached
  * values (and don't start at 0 in count)
@@ -947,7 +947,7 @@ static apr_status_t ba_cleanup(void *data)
  Always check query_string before prompting user,
   but rewrite body/cookies to get if interactive
 
- Definately more work needed here...
+ Definitely more work needed here...
 */
 static int is_interactive_mode(apr_pool_t *pool) {
     char *value = NULL, qs[] = "GATEWAY_INTERFACE";
diff --git a/server/config.c b/server/config.c
index e48d37016f6..4c6973ea74b 100644
--- a/server/config.c
+++ b/server/config.c
@@ -15,7 +15,7 @@
  */
 
 /*
- * http_config.c: once was auxillary functions for reading httpd's config
+ * http_config.c: once was auxiliary functions for reading httpd's config
  * file and converting filenames into a namespace
  *
  * Rob McCool
@@ -736,7 +736,7 @@ AP_DECLARE(void) ap_remove_loaded_module(module *mod)
      *
      *  Note: 1. We cannot determine if the module was successfully
      *           removed by ap_remove_module().
-     *        2. We have not to complain explicity when the module
+     *        2. We have not to complain explicitly when the module
      *           is not found because ap_remove_module() did it
      *           for us already.
      */
diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index be90c7df307..100fe928daa 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -660,7 +660,7 @@ static apr_status_t decrement_connection_count(void *cs_)
  * Previously this was initiated in sig_term() and restart() signal handlers,
  * but we want to be able to start a shutdown/restart from other sources --
  * e.g. on Win32, from the service manager. Now the service manager can
- * call ap_start_shutdown() or ap_start_restart() as appropiate.  Note that
+ * call ap_start_shutdown() or ap_start_restart() as appropriate.  Note that
  * these functions can also be called by the child processes, since global
  * variables are no longer used to pass on the required action to the parent.
  *
diff --git a/server/mpm/eventopt/eventopt.c b/server/mpm/eventopt/eventopt.c
index 318d11149fa..ed36e2629bb 100644
--- a/server/mpm/eventopt/eventopt.c
+++ b/server/mpm/eventopt/eventopt.c
@@ -651,7 +651,7 @@ static apr_status_t decrement_connection_count(void *cs_)
  * Previously this was initiated in sig_term() and restart() signal handlers,
  * but we want to be able to start a shutdown/restart from other sources --
  * e.g. on Win32, from the service manager. Now the service manager can
- * call ap_start_shutdown() or ap_start_restart() as appropiate.  Note that
+ * call ap_start_shutdown() or ap_start_restart() as appropriate.  Note that
  * these functions can also be called by the child processes, since global
  * variables are no longer used to pass on the required action to the parent.
  *
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index ae0fd37461f..7383237357c 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -684,7 +684,7 @@ static void child_main(int child_num_arg)
         SAFE_ACCEPT(accept_mutex_off());      /* unlock after "accept" */
 
         if (status == APR_EGENERAL) {
-            /* resource shortage or should-not-occur occured */
+            /* resource shortage or should-not-occur occurred */
             clean_child_exit(APEXIT_CHILDSICK);
         }
         else if (status != APR_SUCCESS) {
diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index fe49b02ebc9..a6ff2e9fb58 100644
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -758,7 +758,7 @@ static winnt_conn_ctx_t *winnt_get_connection(winnt_conn_ctx_t *context)
         if (!rc) {
             rc = apr_get_os_error();
             ap_log_error(APLOG_MARK, APLOG_DEBUG, rc, ap_server_conf, APLOGNO(00349)
-                         "Child: GetQueuedComplationStatus returned %d",
+                         "Child: GetQueuedCompletionStatus returned %d",
                          rc);
             continue;
         }
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 43638c08804..9bf86256d96 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -734,7 +734,7 @@ static int create_process(apr_pool_t *p, HANDLE *child_proc, HANDLE *child_exit_
  * of this event means that the child process has exited prematurely
  * due to a seg fault or other irrecoverable error. For server
  * robustness, master_main will restart the child process under this
- * condtion.
+ * condition.
  *
  * master_main uses the child_exit_event to signal the child process
  * to exit.
@@ -996,7 +996,7 @@ static void winnt_rewrite_args(process_rec *process)
      *   -k config
      *   -k uninstall
      *   -k stop
-     *   -k shutdown (same as -k stop). Maintained for backward compatability.
+     *   -k shutdown (same as -k stop). Maintained for backward compatibility.
      *
      * We can't leave this phase until we know our identity
      * and modify the command arguments appropriately.
@@ -1041,7 +1041,7 @@ static void winnt_rewrite_args(process_rec *process)
         my_pid = GetCurrentProcessId();
         parent_pid = (DWORD) atol(pid);
 
-        /* Prevent holding open the (nonexistant) console */
+        /* Prevent holding open the (nonexistent) console */
         ap_real_exit_code = 0;
 
         /* The parent gave us stdin, we need to remember this
diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c
index f1d2c3778cc..16f7a05e279 100644
--- a/server/mpm/winnt/service.c
+++ b/server/mpm/winnt/service.c
@@ -67,7 +67,7 @@ static int ReportStatusToSCMgr(int currentState, int waitHint,
  *
  * If ap_real_exit_code is reset to 0, it will not be set or trigger this
  * behavior on exit.  All service and child processes are expected to
- * reset this flag to zero to avoid undesireable side effects.
+ * reset this flag to zero to avoid undesirable side effects.
  */
 AP_DECLARE_DATA int ap_real_exit_code = 1;
 
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 85b7adb0da3..408d317650e 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -457,7 +457,7 @@ static int volatile restart_pending;
  * Previously this was initiated in sig_term() and restart() signal handlers,
  * but we want to be able to start a shutdown/restart from other sources --
  * e.g. on Win32, from the service manager. Now the service manager can
- * call ap_start_shutdown() or ap_start_restart() as appropiate.  Note that
+ * call ap_start_shutdown() or ap_start_restart() as appropriate.  Note that
  * these functions can also be called by the child processes, since global
  * variables are no longer used to pass on the required action to the parent.
  *
diff --git a/server/vhost.c b/server/vhost.c
index eab2e194c10..2720af2d7cf 100644
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -228,7 +228,7 @@ const char *ap_parse_vhost_addrs(apr_pool_t *p,
     server_addr_rec **addrs;
     const char *err;
 
-    /* start the list of addreses */
+    /* start the list of addresses */
     addrs = &s->addrs;
     while (hostname[0]) {
         err = get_addresses(p, ap_getword_conf(p, &hostname), &addrs, s->port);
@@ -572,7 +572,7 @@ AP_DECLARE(void) ap_fini_vhost_config(apr_pool_t *p, server_rec *main_s)
 
     /* The next things to go into the hash table are the virtual hosts
      * themselves.  They're listed off of main_s->next in the reverse
-     * order they occured in the config file, so we insert them at
+     * order they occurred in the config file, so we insert them at
      * the iphash_table_tail but don't advance the tail.
      */
 
diff --git a/support/htpasswd.c b/support/htpasswd.c
index 11023499a47..8589f5a80d5 100644
--- a/support/htpasswd.c
+++ b/support/htpasswd.c
@@ -336,7 +336,7 @@ int main(int argc, const char * const argv[])
         }
         else {
             /*
-             * Error out if -c was omitted for this non-existant file.
+             * Error out if -c was omitted for this non-existent file.
              */
             if (!(mask & APHTP_NEWFILE)) {
                 apr_file_printf(errfile,
diff --git a/support/logresolve.c b/support/logresolve.c
index b0ba6ec1d15..28b7ac50765 100644
--- a/support/logresolve.c
+++ b/support/logresolve.c
@@ -258,7 +258,7 @@ int main(int argc, const char * const argv[])
         resolves++;
 
         /* From here on our we cache each result, even if it was not
-         * succesful
+         * successful
          */
         cachesize++;
 
diff --git a/support/logresolve.pl.in b/support/logresolve.pl.in
index 9fd7cefe3b6..9217aea9c51 100644
--- a/support/logresolve.pl.in
+++ b/support/logresolve.pl.in
@@ -207,7 +207,7 @@ sub nslookup {
 
 	 # do the hostname lookup inside an eval. The eval will use the
 	 # already configured SIGnal handler and drop out of the {} block
-	 # regardless of whether the alarm occured or not.
+	 # regardless of whether the alarm occurred or not.
 	eval {
 		alarm($TIMEOUT);
 		$hostname = gethostbyaddr(gethostbyname($ip), AF_INET);

    
 
    Description:Extend the action of the speling module to also check filename
-without paying attention to the extention. (e.g. foo.gif and foo.jpg).
+without paying attention to the extension. (e.g. foo.gif and foo.jpg).
 This can be particulary useful in conjunction with
 MultiViews
    
 
    Syntax:CheckBasenameMatch on|off
    
 
    AuthLDAPBindAuthoritativeoff|on on dhE
    Determines if other authentication providers are used when a user can be mapped to a DN but the server cannot successfully bind with the user's credentials.
    
 
    AuthLDAPBindDN distinguished-namedhE
    Optional DN to use in binding to the LDAP server
    AuthLDAPBindPassword passworddhE
    Password used in conjuction with the bind DN
    AuthLDAPBindPassword passworddhE
    Password used in conjunction with the bind DN
    
 
    AuthLDAPCharsetConfig file-pathsE
    Language to charset conversion configuration file
    
 
    AuthLDAPCompareAsUser on|off off dhE
    Use the authenticated user's credentials to perform authorization comparisons
    
 
    AuthLDAPCompareDNOnServer on|off on dhE
    Use the LDAP server to compare the DNs
    
 
    CharsetOptions option [option] ... ImplicitAdd svdhE
    Configures charset translation behavior
    
 
    CharsetSourceEnc charsetsvdhE
    Source charset of files
    
 
    CheckBasenameMatch on|off Off svdhE
    Extend the action of the speling module to also check filename
-without paying attention to the extention. (e.g. foo.gif and foo.jpg).
+without paying attention to the extension. (e.g. foo.gif and foo.jpg).
 This can be particulary useful in conjunction with
 MultiViews
    
 
    CheckCaseOnly on|off Off svdhE
    Limits the action of the speling module to case corrections