From: Joshua Slive <slive@apache.org>
Date: Mon, 24 Sep 2007 20:25:02 +0000 (+0000)
Subject: Clarify what happens if you don't have a ServerName in your
X-Git-Tag: 2.3.0~1397
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e50d0d08afa7cae23fa867616bd49d0c57ddf8b4;p=thirdparty%2Fapache%2Fhttpd.git

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/trunk@578949 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index bc8d8a7a01e..7de1b66543e 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -3186,6 +3186,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 fa7175aba60..6799ddfe78c 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -3157,6 +3157,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