Merge r578949 from trunk:

Clarify what happens if you don't have a ServerName in your
<VirtualHost>, since people sometimes assume that this
implies the host has no name, resulting in confusion.

Suggested by: Michael Rasmussen <mikeraz patch.com>

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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 2deca11c0859ca5496a9346c214cd66b3da1b2e2..f49e6dd10b12bf7d53f133740128a9f12ee792ec 100644 (file)
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -3379,6 +3379,11 @@ hostname or IP address</td></tr>
     to match all ports on that address. (This is recommended when used
     with <code>_default_</code>.)</p>
 
+    <p>A <code class="directive"><a href="#servername">ServerName</a></code> should be
+    specified inside each <code class="directive">&lt;VirtualHost&gt;</code> block. If it is absent, the
+    <code class="directive"><a href="#servername">ServerName</a></code> from the "main"
+    server configuration will be inherited.</p>
+
     <div class="warning"><h3>Security</h3>
     <p>See the <a href="../misc/security_tips.html">security tips</a>
     document for details on why your security could be compromised if the

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index ce2698d3bdd6f29a0c0fc405a1d989937a079169..fa7b692472d0f14ad2d61e823333b1ef2febc7cf 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -3348,6 +3348,12 @@ hostname or IP address</description>
     to match all ports on that address. (This is recommended when used
     with <code>_default_</code>.)</p>
 
+    <p>A <directive module="core">ServerName</directive> should be
+    specified inside each <directive
+    type="section">VirtualHost</directive> block. If it is absent, the
+    <directive module="core">ServerName</directive> from the "main"
+    server configuration will be inherited.</p>
+
     <note type="warning"><title>Security</title>
     <p>See the <a href="../misc/security_tips.html">security tips</a>
     document for details on why your security could be compromised if the