]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Merge r1725106 from trunk:
authorEric Covener <covener@apache.org>
Sun, 17 Jan 2016 17:58:48 +0000 (17:58 +0000)
committerEric Covener <covener@apache.org>
Sun, 17 Jan 2016 17:58:48 +0000 (17:58 +0000)
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

docs/manual/mod/core.xml

index 612d2fcd940f4da398635a57c76c1751d3414527..7089893f09469ff80226ff56be01b26f50d8a540 100644 (file)
@@ -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