From: Vincent Bray <noodl@apache.org>
Date: Mon, 23 Jul 2007 07:22:27 +0000 (+0000)
Subject: merge 558629 with 2.2 branch
X-Git-Tag: 2.2.5~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e477786e0bfc97197d212fd4fca234d8c1c56b8;p=thirdparty%2Fapache%2Fhttpd.git

merge 558629 with 2.2 branch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@558632 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/vhosts/name-based.html.en b/docs/manual/vhosts/name-based.html.en
index a520df33834..567f074e844 100644
--- a/docs/manual/vhosts/name-based.html.en
+++ b/docs/manual/vhosts/name-based.html.en
@@ -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
diff --git a/docs/manual/vhosts/name-based.xml b/docs/manual/vhosts/name-based.xml
index b4d4cca836c..ae5a432ae85 100644
--- a/docs/manual/vhosts/name-based.xml
+++ b/docs/manual/vhosts/name-based.xml
@@ -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>