Commit ff6e2f6c authored by Eric Covener's avatar Eric Covener
Browse files

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
parent ddee98c5

docs/manual/mod/core.xml

+4 −0
Original line number Diff line number Diff line
@@ -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>

docs/manual/vhosts/name-based.xml

+4 −0
Original line number Diff line number Diff line
@@ -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