summaryrefslogtreecommitdiffstats
path: root/docs/manual
diff options
context:
space:
mode:
Diffstat (limited to 'docs/manual')
-rw-r--r--docs/manual/mod/core.html.en4
-rw-r--r--docs/manual/vhosts/name-based.html.en6
2 files changed, 9 insertions, 1 deletions
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 152605a72b..178954c231 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -3791,6 +3791,10 @@ to name-virtual hosts</td></tr>
&lt;/VirtualHost&gt;
</code></p></div>
+ <p>Name-based virtual hosts for the best-matching set of <code class="directive"><a href="#virtualhost">&lt;virtualhost&gt;</a></code>s are processsed
+ in the order they appear in the configuration. The first matching <code class="directive"><a href="#servername">ServerName</a></code> or <code class="directive"><a href="#serveralias">ServerAlias</a></code> is used, with no different precedence for wildcards
+ (nor for ServerName vs. ServerAlias). </p>
+
<h3>See also</h3>
<ul>
<li><code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code></li>
diff --git a/docs/manual/vhosts/name-based.html.en b/docs/manual/vhosts/name-based.html.en
index 001c32a234..70f17899fa 100644
--- a/docs/manual/vhosts/name-based.html.en
+++ b/docs/manual/vhosts/name-based.html.en
@@ -118,7 +118,7 @@
<span class="indent">
# This first-listed virtual host is also the default for *:80
ServerName www.example.com<br />
- ServerAlias example.com *.example.com<br />
+ ServerAlias example.com <br />
DocumentRoot /www/domain<br />
</span>
&lt;/VirtualHost&gt;<br />
@@ -153,6 +153,10 @@
first have your DNS server properly configured to map those names to an IP
address associated with your server.</p>
+ <p>Name-based virtual hosts for the best-matching set of <code class="directive"><a href="../mod/core.html#virtualhost">&lt;virtualhost&gt;</a></code>s are processsed
+ in the order they appear in the configuration. The first matching <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> or <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code> is used, with no different precedence for wildcards
+ (nor for ServerName vs. ServerAlias). </p>
+
<p>Finally, you can fine-tune the configuration of the virtual hosts
by placing other directives inside the <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> containers. Most directives can be
placed in these containers and will then change the configuration only of