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 aea21c71fbd038e6ee8625b3b6e431a61d45af34..f33488049bbc602b672839b30bffbc799af22b06 100644 (file)
--- 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 43deba83882f89af741b9f4783368be3a8234829..fa3d63928136195545cac20fd05a0bcf179e280b 100644 (file)
--- 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