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 671eb73e28e02bc9c54ad04a654b06f8c25a6e6b..4c5274d8cc9bee404dd51a05289cbb13ed2c3b3b 100644 (file)
--- 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 51f6c1e2cc15ce1a51328a701c5b60f75e924194..474f8fd599663d6e053fb60ae3dc94c3f90491d6 100644 (file)
--- 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