From: Eric Covener <covener@apache.org>
Date: Thu, 31 May 2012 12:14:23 +0000 (+0000)
Subject: Merge r1344666 from trunk:
X-Git-Tag: 2.4.3~413
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=819c3de828dbba5429db7a93f6b3f616c96bf950;p=apache

Merge r1344666 from trunk:

PR53334, restore info about VirtualHost args used for comparison in name-based vhosts


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1344668 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/vhosts/details.html.en b/docs/manual/vhosts/details.html.en
index 05b2e434da..4bd3fdd424 100644
--- a/docs/manual/vhosts/details.html.en
+++ b/docs/manual/vhosts/details.html.en
@@ -109,6 +109,10 @@
     ServerAlias.  It is also used for all SSL connections if the
     server does not support <a class="glossarylink" href="../glossary.html#servernameindication" title="see glossary">Server Name Indication</a>.</p>
 
+    <p>The complete list of names in the <code>VirtualHost</code>
+    directive are treated just like a (non wildcard) <code>ServerAlias</code> 
+    (but are not overridden by any <code>ServerAlias</code> statement).</p>
+
     <p>For every vhost various default values are set. In
     particular:</p>
 
diff --git a/docs/manual/vhosts/details.xml b/docs/manual/vhosts/details.xml
index f2f27e2e41..3a1c6c1541 100644
--- a/docs/manual/vhosts/details.xml
+++ b/docs/manual/vhosts/details.xml
@@ -109,6 +109,10 @@
     server does not support <glossary
     ref="servernameindication">Server Name Indication</glossary>.</p>
 
+    <p>The complete list of names in the <code>VirtualHost</code>
+    directive are treated just like a (non wildcard) <code>ServerAlias</code> 
+    (but are not overridden by any <code>ServerAlias</code> statement).</p>
+
     <p>For every vhost various default values are set. In
     particular:</p>