For NameVirtualHost, specify which vhost is the default if no

match is found.
For ServerName, copy information about how multiple occurrences
are handled from the vhost doc.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@987251 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index cf15616c71bab6f689181645ad3c1c7897a15d95..e26ff24535bd9b7abec863f8f7a8c2fb41f6a99f 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -2626,6 +2626,10 @@ are necessary.</p>
 
     </example>
 
+    <p>If no matching virtual host is found, then the first listed
+    virtual host that matches the IP address and port will be used.</p>
+
+
     <p>IPv6 addresses must be enclosed in square brackets, as shown
     in the following example:</p>
 
@@ -3104,6 +3108,11 @@ itself</description>
       ServerName www.example.com:80
     </example>
 
+    <p>The <directive>ServerName</directive> directive
+    may appear anywhere within the definition of a server. However,
+    each appearance overrides the previous appearance (within that
+    server).</p>
+
     <p>If no <directive>ServerName</directive> is specified, then the
     server attempts to deduce the hostname by performing a reverse
     lookup on the IP address. If no port is specified in the
@@ -3690,6 +3699,11 @@ hostname or IP address</description>
     <directive module="core">ServerName</directive> from the "main"
     server configuration will be inherited.</p>
 
+    <p>If no matching virtual host is found, then the first listed
+    virtual host that matches the IP address will be used.  As a
+    consequence, the first listed virtual host is the default virtual
+    host.</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