summaryrefslogtreecommitdiffstats
path: root/docs/manual/vhosts/name-based.xml
diff options
context:
space:
mode:
authorKen Coar <coar@apache.org>2015-04-15 22:04:05 +0200
committerKen Coar <coar@apache.org>2015-04-15 22:04:05 +0200
commit430aadce59b536d533be35d333eebfe579a94d16 (patch)
treefcd7eb8e221a10583db0158affd211834cbfa602 /docs/manual/vhosts/name-based.xml
parentBreak <highlight language="commit">foo</highlight> into separate lines. (diff)
downloadapache2-430aadce59b536d533be35d333eebfe579a94d16.tar.xz
apache2-430aadce59b536d533be35d333eebfe579a94d16.zip
* Remove trailing whitespace from a bunch of *.xml files
* Quoted arguments to Rewrite{Base,Cond,Map,Rule}. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673945 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--docs/manual/vhosts/name-based.xml16
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/manual/vhosts/name-based.xml b/docs/manual/vhosts/name-based.xml
index 91e2b5ed11..b6651b734b 100644
--- a/docs/manual/vhosts/name-based.xml
+++ b/docs/manual/vhosts/name-based.xml
@@ -76,12 +76,12 @@
module="core">ServerAlias</directive> directives to the server name
present in the request.</p>
- <p>If you omit the <directive module="core">ServerName</directive>
+ <p>If you omit the <directive module="core">ServerName</directive>
directive from any name-based virtual host, the server will default
to a fully qualified domain name (FQDN) derived from the system hostname.
This implicitly set server name can lead to counter-intuitive virtual host
matching and is discouraged.</p>
-
+
<section id="defaultvhost"><title>The default name-based vhost for an IP and port combination </title>
<p> If no matching ServerName or ServerAlias is found in the set of
virtual hosts containing the most specific matching IP address and port
@@ -131,9 +131,9 @@
<note><title>ServerName inheritance</title>
<p> It is best to always explicitly list a <directive module="core"
>ServerName</directive> in every name-based virtual host.</p>
- <p>If a <directive module="core">VirtualHost</directive> doesn't specify
- a <directive module="core">ServerName</directive>, a server name will be
- inherited from the base server configuration. If no server name was
+ <p>If a <directive module="core">VirtualHost</directive> doesn't specify
+ a <directive module="core">ServerName</directive>, a server name will be
+ inherited from the base server configuration. If no server name was
specified globally, one is detected at startup through reverse DNS resolution
of the first listening address. In either case, this inherited server name
will influence name-based virtual host resolution, so it is best to always
@@ -150,7 +150,7 @@
&lt;VirtualHost *:80&gt;
# This first-listed virtual host is also the default for *:80
ServerName www.example.com
- ServerAlias example.com
+ ServerAlias example.com
DocumentRoot "/www/domain"
&lt;/VirtualHost&gt;
@@ -188,7 +188,7 @@
address associated with your server.</p>
<p>Name-based virtual hosts for the best-matching set of <directive
- type="section" module="core">virtualhost</directive>s are processed
+ type="section" module="core">virtualhost</directive>s are processed
in the order they appear in the configuration. The first matching <directive
module="core">ServerName</directive> or <directive module="core"
>ServerAlias</directive> is used, with no different precedence for wildcards
@@ -196,7 +196,7 @@
<p>The complete list of names in the <directive module="core"
>VirtualHost</directive>
- directive are treated just like a (non wildcard)
+ directive are treated just like a (non wildcard)
<directive module="core">ServerAlias</directive>.</p>
<p>Finally, you can fine-tune the configuration of the virtual hosts