From: Eric Covener <covener@apache.org>
Date: Thu, 31 May 2012 12:29:19 +0000 (+0000)
Subject: Merge r1344675 from trunk:
X-Git-Tag: 2.2.23~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c95c16e2b76f3afefe2f40002b0b0ee1e9c3b51;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1344675 from trunk:

PR5334, leave a hint about VirtualHost args acting like serveralias for people who don't read details.html


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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index aea21c71fbd..f33488049bb 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -2996,6 +2996,10 @@ to name-virtual hosts</description>
     >ServerAlias</directive> is used, with no different precedence for wildcards
     (nor for ServerName vs. ServerAlias).  </p>
 
+    <p>The complete list of names in the <directive>VirtualHost</directive>
+    directive are treated just like a (non wildcard) 
+    <directive>ServerAlias</directive>.</p>
+
 </usage>
 <seealso><directive module="core">UseCanonicalName</directive></seealso>
 <seealso><a href="../vhosts/">Apache Virtual Host documentation</a></seealso>
diff --git a/docs/manual/vhosts/name-based.xml b/docs/manual/vhosts/name-based.xml
index 43deba83882..fa3d6392813 100644
--- a/docs/manual/vhosts/name-based.xml
+++ b/docs/manual/vhosts/name-based.xml
@@ -165,6 +165,10 @@
     first have your DNS server properly configured to map those names to an IP
     address associated with your server.</p>
 
+    <p>The complete list of names in the <directive module="core"
+    >VirtualHost</directive> 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
     by placing other directives inside the <directive type="section"
     module="core">VirtualHost</directive> containers. Most directives can be