summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Toscano <elukey@apache.org>2017-01-25 15:27:20 +0000
committerLuca Toscano <elukey@apache.org>2017-01-25 15:27:20 +0000
commit09a44469a2c0bb9d9242620708252cbebdc8143b (patch)
treeb7e214e7d5f023b67c5d74dccf47c8baa3505bbf
parent260009189cc8444dce4d012959b525920fe4f7cf (diff)
downloadhttpd-09a44469a2c0bb9d9242620708252cbebdc8143b.tar.gz
Correct some typos across the documentation.
This commit was made thanks to the tool and PR created by Lajos Veres (vlajos) on github. PR: https://github.com/apache/httpd/pull/6 Tool: https://github.com/vlajos/misspell_fixer git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1780218 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/glossary.xml2
-rw-r--r--docs/manual/mod/core.xml2
-rw-r--r--docs/manual/mod/mod_authnz_ldap.xml2
-rw-r--r--docs/manual/mod/mod_cache.xml8
-rw-r--r--docs/manual/mod/mod_ldap.xml2
-rw-r--r--docs/manual/mod/mod_lua.xml4
-rw-r--r--docs/manual/mod/mod_rewrite.xml2
-rw-r--r--docs/manual/mod/mod_ssl.xml2
-rw-r--r--docs/manual/socache.xml2
-rw-r--r--docs/manual/ssl/ssl_intro.xml2
10 files changed, 14 insertions, 14 deletions
diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml
index f8900d5c7e..b573059462 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 0afe34148f..17a4994996 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -961,7 +961,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 a17c14b09d..686e8ec151 100644
--- a/docs/manual/mod/mod_authnz_ldap.xml
+++ b/docs/manual/mod/mod_authnz_ldap.xml
@@ -938,7 +938,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 a5e9080ba2..7723ddaebd 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>
@@ -724,10 +724,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 3c89c84cc7..675780ffef 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 077fddc3ff..5ff9c11a9b 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_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 1b0028f152..e03e1fc091 100644
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -1371,7 +1371,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 596876c005..f19994d64f 100644
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -1946,7 +1946,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>