You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2012/05/31 14:25:23 UTC
svn commit: r1344676 - in /httpd/httpd/branches/2.4.x/docs/manual:
mod/core.xml vhosts/name-based.xml
Author: covener
Date: Thu May 31 12:25:23 2012
New Revision: 1344676
URL: http://svn.apache.org/viewvc?rev=1344676&view=rev
Log:
Merge r1344675 from trunk:
PR5334, leave a hint about VirtualHost args acting like serveralias for people who don't read details.html
Modified:
httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml
httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml?rev=1344676&r1=1344675&r2=1344676&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml Thu May 31 12:25:23 2012
@@ -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>
Modified: httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml?rev=1344676&r1=1344675&r2=1344676&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/vhosts/name-based.xml Thu May 31 12:25:23 2012
@@ -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