svn commit: r1301398 - in /httpd/httpd/trunk/docs/manual: mod/core.xml vhosts/name-based.xml

[co...@apache.org]

Author: covener
Date: Fri Mar 16 09:45:01 2012
New Revision: 1301398

URL: http://svn.apache.org/viewvc?rev=1301398&view=rev
Log:
fix a misleading example that implies ServerName has precedence over a ServerAlias.  

We stop when a vhost matches for any reason (not 2.4 specific).  Mention this explicitly.

Modified:
    httpd/httpd/trunk/docs/manual/mod/core.xml
    httpd/httpd/trunk/docs/manual/vhosts/name-based.xml

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml?rev=1301398&r1=1301397&r2=1301398&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml Fri Mar 16 09:45:01 2012
@@ -3777,6 +3777,13 @@ to name-virtual hosts</description>
       # ...<br />
       &lt;/VirtualHost&gt;
     </example>
+
+    <p>Name-based virtual hosts for the best-matching set of  <directive
+    type="section" module="core">virtualhost</directive>s are processsed
+    in the order they appear in the configuration.  The first matching <directive
+    module="core">ServerName</directive> or <directive module="core"
+    >ServerAlias</directive> is used, with no different precedence for wildcards
+    (nor for ServerName vs. ServerAlias).  </p>
 </usage>
 <seealso><directive module="core">UseCanonicalName</directive></seealso>
 <seealso><a href="../vhosts/">Apache HTTP Server Virtual Host documentation</a></seealso>

Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.xml?rev=1301398&r1=1301397&r2=1301398&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.xml (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.xml Fri Mar 16 09:45:01 2012
@@ -132,7 +132,7 @@
         <indent>
             # This first-listed virtual host is also the default for *:80
             ServerName www.example.com<br />
-            ServerAlias example.com *.example.com<br />
+            ServerAlias example.com <br />
             DocumentRoot /www/domain<br />
         </indent>
         &lt;/VirtualHost&gt;<br />
@@ -171,6 +171,13 @@
     first have your DNS server properly configured to map those names to an IP
     address associated with your server.</p>
 
+    <p>Name-based virtual hosts for the best-matching set of  <directive
+    type="section" module="core">virtualhost</directive>s are processsed 
+    in the order they appear in the configuration.  The first matching <directive
+    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>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