From: Eric Covener <covener@apache.org>
Date: Sun, 17 Jan 2016 17:58:48 +0000 (+0000)
Subject: Merge r1725106 from trunk:
X-Git-Tag: 2.4.19~292
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6d51bea7fc52466766ed06a57013f38b2e975fb;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1725106 from trunk:

clarify a butchered sentence about missing ServerName, which
is a regular early step in "my directive didn't do anything".

This describes ap_get_local_host()



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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 612d2fcd940..7089893f094 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -3963,9 +3963,10 @@ itself</description>
     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 client visible hostname by performing a
-    reverse lookup on an IP address of the systems hostname.</p>
+    <p>If no <directive>ServerName</directive> is specified, the
+    server attempts to deduce the client visible hostname by first asking 
+    the operating system for the system hostname, and if that fails, 
+    performing a reverse lookup on an IP address present on the system.</p>
     
     <p>If no port is specified in the
     <directive>ServerName</directive>, then the server will use the