diff options
| author | Lucien Gentis <lgentis@apache.org> | 2010-12-29 16:18:54 +0000 |
|---|---|---|
| committer | Lucien Gentis <lgentis@apache.org> | 2010-12-29 16:18:54 +0000 |
| commit | 60bad7a0683f28d67be32deb1acfc7c3000afda0 (patch) | |
| tree | bc1d9dcd5a1647b1f2782fd4a1ff14ba8d02e375 /docs/manual/vhosts | |
| parent | 404e8b8ec7e3fc75f770a35ced4d6017c50639fb (diff) | |
| download | httpd-60bad7a0683f28d67be32deb1acfc7c3000afda0.tar.gz | |
Typos.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1053666 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual/vhosts')
| -rw-r--r-- | docs/manual/vhosts/details.xml | 4 | ||||
| -rw-r--r-- | docs/manual/vhosts/name-based.xml | 6 |
2 files changed, 5 insertions, 5 deletions
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> |