diff options
author | Lucien Gentis <lgentis@apache.org> | 2010-12-29 17:18:54 +0100 |
---|---|---|
committer | Lucien Gentis <lgentis@apache.org> | 2010-12-29 17:18:54 +0100 |
commit | 60bad7a0683f28d67be32deb1acfc7c3000afda0 (patch) | |
tree | bc1d9dcd5a1647b1f2782fd4a1ff14ba8d02e375 /docs/manual | |
parent | update transformations (diff) | |
download | apache2-60bad7a0683f28d67be32deb1acfc7c3000afda0.tar.xz apache2-60bad7a0683f28d67be32deb1acfc7c3000afda0.zip |
Typos.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1053666 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual')
-rw-r--r-- | docs/manual/expr.xml | 2 | ||||
-rw-r--r-- | docs/manual/mod/core.xml | 6 | ||||
-rw-r--r-- | docs/manual/mod/mod_headers.xml | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_substitute.xml | 2 | ||||
-rw-r--r-- | docs/manual/mod/mpm_common.xml | 2 | ||||
-rw-r--r-- | docs/manual/vhosts/details.xml | 4 | ||||
-rw-r--r-- | docs/manual/vhosts/name-based.xml | 6 |
7 files changed, 12 insertions, 12 deletions
diff --git a/docs/manual/expr.xml b/docs/manual/expr.xml index 0ecf639a42..6aed34d180 100644 --- a/docs/manual/expr.xml +++ b/docs/manual/expr.xml @@ -407,7 +407,7 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>" <section id="rebackref"> <title>Regular expression backreferences</title> <p>The strings <code>$0</code> ... <code>$9</code> allow to reference - the capture groups form a previously executed, successfully + the capture groups from a previously executed, successfully matching regular expressions. They can normally only be used in the same expression as the matching regex, but some modules allow special uses.</p> diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index b301edc79e..2fbba7802b 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -1106,7 +1106,7 @@ in case of an error</description> </example> <p>Specifying <code>connection</code> or <code>request</code> as first - paramter allows to specify additional formats, causing additional + parameter allows to specify additional formats, causing additional information to be logged when the first message is logged for a specific connection or request, respectivly. This additional information is only logged once per connection/request. If a connection or request is processed @@ -3984,14 +3984,14 @@ hostname or IP address</description> <p>When a request is received, the server first maps it to the best matching <directive type="section">VirtualHost</directive> based on the local IP address and port combination only. Non-wildcards have a higher - precedence. if no match based on IP and port occurs at all, the + precedence. If no match based on IP and port occurs at all, the "main" server configuration is used.</p> <p>If multiple virtual hosts contain the best matching IP address and port, the server selects from these virtual hosts the best match based on the requested hostname. If no matching name-based virtual host is found, then the first listed virtual host that matched the IP address will be - used. As a consequence, the first listed virtual for a given IP address + used. As a consequence, the first listed virtual host for a given IP address and port combination is default virtual host for that IP and port combination.</p> diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml index db3c64e5c7..2f6b9e18d6 100644 --- a/docs/manual/mod/mod_headers.xml +++ b/docs/manual/mod/mod_headers.xml @@ -318,7 +318,7 @@ headers</description> will have to read on for further complications.</p> <p> The default value of <code>onsuccess</code> may need to be changed to - <code>always</code> under the circumstances similar to those listed below + <code>always</code> under the circumstances similar to those listed below. Note also that repeating this directive with both conditions makes sense in some scenarios because <code>always</code> is not a superset of <code>onsuccess</code> with respect to existing headers:</p> diff --git a/docs/manual/mod/mod_substitute.xml b/docs/manual/mod/mod_substitute.xml index 7191740b85..5be6b3dc99 100644 --- a/docs/manual/mod/mod_substitute.xml +++ b/docs/manual/mod/mod_substitute.xml @@ -91,7 +91,7 @@ </Location> </example> - <p>Backreferences can be used in the comparison and in the substituion, + <p>Backreferences can be used in the comparison and in the substitution, when regular expressions are used, as illustrated in the following example: </p> <example><title>Example of using backreferences and captures</title> <Location /> diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml index a923f14a31..c18043f836 100644 --- a/docs/manual/mod/mpm_common.xml +++ b/docs/manual/mod/mpm_common.xml @@ -729,7 +729,7 @@ client connections</description> of adjustment should only be made in a test environment which allows the full set of web server processing can be exercised, as there may be infrequent requests which require more stack to process. - The minumum required stack size strongly depends on the modules + The minimum required stack size strongly depends on the modules used, but any change in the web server configuration can invalidate the current <directive>ThreadStackSize</directive> setting.</li> </ul> diff --git a/docs/manual/vhosts/details.xml b/docs/manual/vhosts/details.xml index 8fc83fd933..4036af603b 100644 --- a/docs/manual/vhosts/details.xml +++ b/docs/manual/vhosts/details.xml @@ -185,7 +185,7 @@ <section id="ipbased"><title>IP-based vhost</title> <p>If there is exactly one <code>VirtualHost</code> directive - listing the IP address and port combibation that was determined + listing the IP address and port combination that was determined to be the best match, no further actions are performed and the request is served from the matching vhost.</p> @@ -193,7 +193,7 @@ <section id="namebased"><title>Name-based vhost</title> - <p>If there are multiple <code>VirtalHost</code> directives listing + <p>If there are multiple <code>VirtualHost</code> directives listing the IP address and port combination that was determined to be the best match, the "list" in the remaining steps refers to the list of vhosts that matched, in the order they were in the configuration file.</p> diff --git a/docs/manual/vhosts/name-based.xml b/docs/manual/vhosts/name-based.xml index 1ff58e0875..964791d2ba 100644 --- a/docs/manual/vhosts/name-based.xml +++ b/docs/manual/vhosts/name-based.xml @@ -63,7 +63,7 @@ </ul> <p> Name-based virtual hosting builds off of the IP-based virtual host - selection algoirthm, meaning that searches for the proper server name + selection algorithm, meaning that searches for the proper server name occur only between virtual hosts that have the best IP-based address.</p> @@ -81,7 +81,7 @@ <p>When a request arrives, the server will find the best (most specific) matching <directive type="section" module="core">VirtualHost</directive> argument based on the IP address and port used by the request. If there is more than one virtual host - contanin this best-match address and port combination, Apache will further + containing this best-match address and port combination, Apache will further compare the <directive module="core" >ServerName</directive> and <directive module="core">ServerAlias</directive> directives to the server name present in the request.</p> @@ -90,7 +90,7 @@ <p> If no matching ServerName or ServerAlias is found in the set of virtual hosts containing the most specific matching IP address and port combination, then <strong>the first listed virtual host</strong> that - matches the will be used.</p></section> + matches that will be used.</p></section> </section> <section id="using"><title>Using Name-based Virtual Hosts</title> |