From: Eric Covener <covener@apache.org>
Date: Thu, 31 May 2012 12:18:51 +0000 (+0000)
Subject: merge 1344666 from trunk manually, restore NVH resolutin detail
X-Git-Tag: 2.2.23~163
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c72fb7aae92a52b4e57c7abbebbc4beb9f19df14;p=thirdparty%2Fapache%2Fhttpd.git

merge 1344666 from trunk manually, restore NVH resolutin detail

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

diff --git a/docs/manual/vhosts/details.html.en b/docs/manual/vhosts/details.html.en
index 671eb73e28e..4c5274d8cc9 100644
--- a/docs/manual/vhosts/details.html.en
+++ b/docs/manual/vhosts/details.html.en
@@ -279,6 +279,10 @@
     matches against the real port to which the client sent the
     request.</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>If the client submitted a HTTP/1.0 request without
     <code>Host:</code> header field we don't know to what server
     the client tried to connect and any existing
diff --git a/docs/manual/vhosts/details.xml b/docs/manual/vhosts/details.xml
index 51f6c1e2cc1..474f8fd5996 100644
--- a/docs/manual/vhosts/details.xml
+++ b/docs/manual/vhosts/details.xml
@@ -272,6 +272,10 @@
     matches against the real port to which the client sent the
     request.</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>If the client submitted a HTTP/1.0 request without
     <code>Host:</code> header field we don't know to what server
     the client tried to connect and any existing