From: Rich Bowen <rbowen@apache.org>
Date: Thu, 30 Sep 2010 17:01:39 +0000 (+0000)
Subject: Mention specific error message that people might come searching for.
X-Git-Tag: 2.3.9~384
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57a5f53ef3aaaccb0d2c82a2f15c11d146927714;p=thirdparty%2Fapache%2Fhttpd.git

Mention specific error message that people might come searching for.


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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 137f84f1a29..27bd79e7af6 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -3322,7 +3322,6 @@ itself</td></tr>
     section specifies what hostname must appear in the request's
     <code>Host:</code> header to match this virtual host.</p>
 
-
     <p>Sometimes, the server runs behind a device that processes SSL,
     such as a reverse proxy, load balancer or SSL offload
     appliance. When this is the case, specify the
@@ -3340,6 +3339,17 @@ itself</td></tr>
     specified port, or to the port number given in the client's request.
     </p>
 
+    <div class="warning">
+    <p>Failure to set <code class="directive">ServerName</code> to a name that
+    your server can resolve to an IP address will result in a startup
+    warning. <code>httpd</code> will then use whatever hostname it can
+    determine, using the system's <code>hostname</code> command. This
+    will almost never be the hostname you actually want.</p>
+    <div class="example"><p><code>
+    httpd: Could not reliably determine the server's fully qualified domain name, using rocinante.local for ServerName
+    </code></p></div>
+    </div>
+
 
 <h3>See also</h3>
 <ul>
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 85295136c8f..f74a47ab065 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -3319,7 +3319,6 @@ itself</description>
     section specifies what hostname must appear in the request's
     <code>Host:</code> header to match this virtual host.</p>
 
-
     <p>Sometimes, the server runs behind a device that processes SSL,
     such as a reverse proxy, load balancer or SSL offload
     appliance. When this is the case, specify the
@@ -3337,6 +3336,17 @@ itself</description>
     specified port, or to the port number given in the client's request.
     </p>
 
+    <note type="warning">
+    <p>Failure to set <directive>ServerName</directive> to a name that
+    your server can resolve to an IP address will result in a startup
+    warning. <code>httpd</code> will then use whatever hostname it can
+    determine, using the system's <code>hostname</code> command. This
+    will almost never be the hostname you actually want.</p>
+    <example>
+    httpd: Could not reliably determine the server's fully qualified domain name, using rocinante.local for ServerName
+    </example>
+    </note>
+
 </usage>
 
 <seealso><a href="../dns-caveats.html">Issues Regarding DNS and