diff options
Diffstat (limited to '')
| -rw-r--r-- | docs/manual/developer/lua.xml | 2 | ||||
| -rw-r--r-- | docs/manual/expr.xml | 2 | ||||
| -rw-r--r-- | docs/manual/glossary.xml | 2 | ||||
| -rw-r--r-- | docs/manual/mod/core.xml | 2 | ||||
| -rw-r--r-- | docs/manual/mod/mod_authnz_ldap.xml | 2 | ||||
| -rw-r--r-- | docs/manual/mod/mod_cache.xml | 8 | ||||
| -rw-r--r-- | docs/manual/mod/mod_ldap.xml | 2 | ||||
| -rw-r--r-- | docs/manual/mod/mod_lua.xml | 4 | ||||
| -rw-r--r-- | docs/manual/mod/mod_proxy_connect.xml | 2 | ||||
| -rw-r--r-- | docs/manual/mod/mod_rewrite.xml | 2 | ||||
| -rw-r--r-- | docs/manual/mod/mod_ssl.xml | 2 | ||||
| -rw-r--r-- | docs/manual/socache.xml | 2 | ||||
| -rw-r--r-- | docs/manual/ssl/ssl_intro.xml | 2 |
13 files changed, 17 insertions, 17 deletions
diff --git a/docs/manual/developer/lua.xml b/docs/manual/developer/lua.xml index 3cd23374d8..32e84e3c8f 100644 --- a/docs/manual/developer/lua.xml +++ b/docs/manual/developer/lua.xml @@ -483,7 +483,7 @@ LuaAuthzProvider rights /path/to/lua/script.lua rights_handler <highlight language="lua"> --[[ 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/expr.xml b/docs/manual/expr.xml index 17a36c6b00..4721abb09f 100644 --- a/docs/manual/expr.xml +++ b/docs/manual/expr.xml @@ -545,7 +545,7 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>" <td>Escape characters as required by LDAP distinguished name escaping (RFC4514) and LDAP filter escaping (RFC4515).</td><td></td></tr> <tr><td><code>replace</code></td> - <td>replace(string, "from", "to") replaces all occurences of "from" + <td>replace(string, "from", "to") replaces all occurrences of "from" in the string with "to".</td><td></td></tr> </table> diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml index e8a858faba..d855f958d7 100644 --- a/docs/manual/glossary.xml +++ b/docs/manual/glossary.xml @@ -371,7 +371,7 @@ See: <a href="ssl/">SSL/TLS Encryption</a> </dd> - <dt><a name="regularexpresion" id="regularexpresion">Regular Expression</a> + <dt><a name="regularexpression" id="regularexpression">Regular Expression</a> <a name="regex" id="regex">(Regex)</a></dt> <dd>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/mod/core.xml b/docs/manual/mod/core.xml index 2f45798d59..431c513a79 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -984,7 +984,7 @@ the contents of file-system directories matching a regular expression.</descript <p>matches directories in <code>/www/</code> (or any subdirectory thereof) that consist of three numbers.</p> - <note><title>Compatability</title> + <note><title>Compatibility</title> Prior to 2.3.9, this directive implicitly applied to sub-directories (like <directive module="core" type="section">Directory</directive>) and could not match the end of line symbol ($). In 2.3.9 and later, diff --git a/docs/manual/mod/mod_authnz_ldap.xml b/docs/manual/mod/mod_authnz_ldap.xml index eef6750bd1..8e3210cd3a 100644 --- a/docs/manual/mod/mod_authnz_ldap.xml +++ b/docs/manual/mod/mod_authnz_ldap.xml @@ -975,7 +975,7 @@ AuthLDAPInitialBindPattern (.+) cn=$1,dc=example,dc=com <directivesynopsis> <name>AuthLDAPBindPassword</name> -<description>Password used in conjuction with the bind DN</description> +<description>Password used in conjunction with the bind DN</description> <syntax>AuthLDAPBindPassword <em>password</em></syntax> <contextlist><context>directory</context><context>.htaccess</context> </contextlist> diff --git a/docs/manual/mod/mod_cache.xml b/docs/manual/mod/mod_cache.xml index 4f68feca86..4c91c35110 100644 --- a/docs/manual/mod/mod_cache.xml +++ b/docs/manual/mod/mod_cache.xml @@ -470,7 +470,7 @@ CacheEnable disk http://.example.org/ <usage> <p>The <directive>CacheMaxExpire</directive> 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.</p> @@ -493,7 +493,7 @@ CacheEnable disk http://.example.org/ <usage> <p>The <directive>CacheMinExpire</directive> 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.</p> @@ -723,10 +723,10 @@ LastModified date.</description> <li><code>/someapplication/image.gif;jsessionid=123456789</code></li> <li><code>/someapplication/image.gif?PHPSESSIONID=12345678</code></li> </ul> - <p>This causes cachable resources to be stored separately for each session, which + <p>This causes cacheable resources to be stored separately for each session, which is often not desired. <directive>CacheIgnoreURLSessionIdentifiers</directive> 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. </p> <p><code>CacheIgnoreURLSessionIdentifiers None</code> clears the list of ignored diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml index 0df854593e..b3b5702452 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] <p>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.</p> + settings are superseded.</p> <p>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.xml b/docs/manual/mod/mod_lua.xml index 470a11fef6..fa33c13d89 100644 --- a/docs/manual/mod/mod_lua.xml +++ b/docs/manual/mod/mod_lua.xml @@ -936,11 +936,11 @@ r:htpassword(string [,algorithm [,cost]]) -- Creates a password hash from a stri </highlight> <highlight language="lua"> -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. </highlight> <highlight language="lua"> -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. </highlight> <highlight language="lua"> diff --git a/docs/manual/mod/mod_proxy_connect.xml b/docs/manual/mod/mod_proxy_connect.xml index 76bf8b4194..6e7a987644 100644 --- a/docs/manual/mod/mod_proxy_connect.xml +++ b/docs/manual/mod/mod_proxy_connect.xml @@ -67,7 +67,7 @@ <p>CONNECT method requests are controlled by the <directive module="mod_proxy">Proxy</directive> block as any other HTTP request going through. - SSL connections through a proxy may be filtered explicitely + SSL connections through a proxy may be filtered explicitly by specifying the target host and port, for instance: </p> diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml index f542186ffd..7c5a2b5c9e 100644 --- a/docs/manual/mod/mod_rewrite.xml +++ b/docs/manual/mod/mod_rewrite.xml @@ -1396,7 +1396,7 @@ cannot use <code>$N</code> in the substitution string! <tr> <td>qslast|QSL</td> <td>Interpret the last (right-most) question mark as the query string - delimeter, instead of the first (left-most) as normally used. + delimiter, instead of the first (left-most) as normally used. Available in 2.4.19 and later. <em><a href="../rewrite/flags.html#flag_qsl">details ...</a></em></td> diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml index 37f4365beb..836c7d4065 100644 --- a/docs/manual/mod/mod_ssl.xml +++ b/docs/manual/mod/mod_ssl.xml @@ -1950,7 +1950,7 @@ As of release 2.4.21, all configurations which enable either one of the will use the new <directive module="mod_ssl">SSLProxyCheckPeerName</directive> behavior, and all configurations which disable either one of the <code>SSLProxyCheckPeerName</code> or <code>SSLProxyCheckPeerCN</code> options -will supress all remote server certificate name validation. Only the following +will suppress all remote server certificate name validation. Only the following configuration will trigger the legacy certificate CN comparison in 2.4.21 and later releases; </p> diff --git a/docs/manual/socache.xml b/docs/manual/socache.xml index d0338b8c8e..61499b0d30 100644 --- a/docs/manual/socache.xml +++ b/docs/manual/socache.xml @@ -67,7 +67,7 @@ <dt>const char *create(ap_socache_instance_t **instance, const char *arg, apr_pool_t *tmp, apr_pool_t *p);</dt> <dd>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.</dd> <dt>apr_status_t init(ap_socache_instance_t *instance, const char *cname, diff --git a/docs/manual/ssl/ssl_intro.xml b/docs/manual/ssl/ssl_intro.xml index ecd6bddfe1..b6df87ca4c 100644 --- a/docs/manual/ssl/ssl_intro.xml +++ b/docs/manual/ssl/ssl_intro.xml @@ -530,7 +530,7 @@ the Internet Engineering Task Force (IETF).</p> >AC96</a>, ch13].</p> </section> -<section id="digestfuntion"> +<section id="digestfunction"> <title>Digest Function</title> <p>The choice of digest function determines how a digest is created from a record unit. SSL supports the following:</p> |