httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From no...@apache.org
Subject svn commit: r558632 - in /httpd/httpd/branches/2.2.x/docs/manual/vhosts: name-based.html.en name-based.xml
Date Mon, 23 Jul 2007 07:22:28 GMT
Author: noodl
Date: Mon Jul 23 00:22:27 2007
New Revision: 558632

URL: http://svn.apache.org/viewvc?view=rev&rev=558632
Log:
merge 558629 with 2.2 branch

Modified:
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/name-based.html.en
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/name-based.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/name-based.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/name-based.html.en?view=diff&rev=558632&r1=558631&r2=558632
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/name-based.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/name-based.html.en Mon Jul 23 00:22:27 2007
@@ -90,8 +90,8 @@
     <p>The next step is to create a <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
block for
     each different host that you would like to serve. The argument to the
     <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
directive
-    should be the same as the argument to the <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code>
directive (ie, an IP address,
-    or <code>*</code> for all addresses).  Inside each <code class="directive"><a
href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
block, you will need at minimum a
+    must match a defined <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code>
directive. (In this usual case,
+    this will be "*:80").  Inside each <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
block, you will need at minimum a
     <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code>
directive to designate
     which host is served and a <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
     directive to show where in the filesystem the content for that host

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/name-based.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/name-based.xml?view=diff&rev=558632&r1=558631&r2=558632
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/name-based.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/name-based.xml Mon Jul 23 00:22:27 2007
@@ -107,9 +107,9 @@
     module="core">VirtualHost</directive> block for
     each different host that you would like to serve. The argument to the
     <directive type="section" module="core">VirtualHost</directive> directive
-    should be the same as the argument to the <directive
-    module="core">NameVirtualHost</directive> directive (ie, an IP address,
-    or <code>*</code> for all addresses).  Inside each <directive type="section"

+    must match a defined <directive
+    module="core">NameVirtualHost</directive> directive. (In this usual case,
+    this will be "*:80").  Inside each <directive type="section"	
     module="core">VirtualHost</directive> block, you will need at minimum a
     <directive module="core">ServerName</directive> directive to designate
     which host is served and a <directive module="core">DocumentRoot</directive>



Mime
View raw message