diff options
author | Jim Jagielski <jim@apache.org> | 2011-09-23 15:36:39 +0200 |
---|---|---|
committer | Jim Jagielski <jim@apache.org> | 2011-09-23 15:36:39 +0200 |
commit | 69c1a5c854b89a80cf5ca08b7b38d9f0a88c2667 (patch) | |
tree | 304a1e7196cfcd252ab9ce7c54b2de985e319a17 /docs/manual/vhosts/details.xml | |
parent | docco xforms (diff) | |
download | apache2-69c1a5c854b89a80cf5ca08b7b38d9f0a88c2667.tar.xz apache2-69c1a5c854b89a80cf5ca08b7b38d9f0a88c2667.zip |
Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174747 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual/vhosts/details.xml')
-rw-r--r-- | docs/manual/vhosts/details.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/manual/vhosts/details.xml b/docs/manual/vhosts/details.xml index 4036af603b..c84f4aba31 100644 --- a/docs/manual/vhosts/details.xml +++ b/docs/manual/vhosts/details.xml @@ -69,7 +69,7 @@ <p>The address can be specified as <code>*</code>, which will match a request if no other vhost has the explicit address on which the request was - received. </p> + received. </p> <p>The address appearing in the <code>VirtualHost</code> directive can have an optional port. If the port is unspecified, @@ -83,9 +83,9 @@ Use the <directive module="core">Listen</directive> directive to control the addresses and ports on which the server listens.) </p> - + <p>Collectively the - entire set of addresses (including multiple + entire set of addresses (including multiple results from DNS lookups) are called the vhost's <em>address set</em>.</p> @@ -94,7 +94,7 @@ whenever the most specific match for an IP address and port combination is listed in multiple virtual hosts.</p> - <p>The + <p>The <directive module="core">ServerName</directive> directive may appear anywhere within the definition of a server. However, each appearance overrides the previous appearance (within that @@ -195,7 +195,7 @@ <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 + 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> <p>If the connection is using SSL, the server supports <glossary @@ -272,11 +272,11 @@ the client sent the request.</li> <li>If two vhosts have an address in common, those common addresses - act as name-based virtual hosts implicitly. This is new behavior as of + act as name-based virtual hosts implicitly. This is new behavior as of 2.3.11.</li> <li>The main server is only used to serve a request if the IP - address and port number to which the client connected + address and port number to which the client connected does not match any vhost (including a <code>*</code> vhost). In other words, the main server only catches a request for an unspecified address/port |