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.4.x@1344676 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index ed73eeb717ac86829efdacddfb096b6c194ccf89..4f9a9238b7c0c81830558a40d5c74cc518fceb45 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -3699,6 +3699,11 @@ to name-virtual hosts</description>
     module="core">ServerName</directive> or <directive module="core"
     >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 HTTP Server Virtual Host documentation</a></seealso>

diff --git a/docs/manual/vhosts/name-based.xml b/docs/manual/vhosts/name-based.xml
index e5a52d9a855d482850192bf8a4ab31441910c4fc..9fbf2ad44e7183873b49194c4869b8537f47d114 100644 (file)
--- a/docs/manual/vhosts/name-based.xml
+++ b/docs/manual/vhosts/name-based.xml
@@ -175,6 +175,11 @@
     >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 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