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

Merge r1725102 from trunk:

update syntax to allow for non-FQDN domains or IP addresses in ServerName.

Since UseCanonicalName defaults to OFF, name-based vhosts isn't really an
"additional" purpose of a ServerName. Also update the syntax to not insist
on an FQDN -- generally the ServerName needs to be something the client
and server can both resolve, but it's not required to be an FQDN or even
a domain name.

Leave the example as www.example.com




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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 44ff586a931..612d2fcd940 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -3931,21 +3931,25 @@ to name-virtual hosts</description>
 <name>ServerName</name>
 <description>Hostname and port that the server uses to identify
 itself</description>
-<syntax>ServerName [<var>scheme</var>://]<var>fully-qualified-domain-name</var>[:<var>port</var>]</syntax>
+<syntax>ServerName [<var>scheme</var>://]<var>domain-name</var>|<var>ip-address</var>[:<var>port</var>]</syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
 
 <usage>
     <p>The <directive>ServerName</directive> directive sets the
-    request scheme, hostname and
-    port that the server uses to identify itself.  This is used when
-    creating redirection URLs.</p>
+    request scheme, hostname and port that the server uses to identify itself.
+    </p>
 
-    <p>Additionally, <directive>ServerName</directive> is used (possibly
+    <p><directive>ServerName</directive> is used (possibly
     in conjunction with <directive>ServerAlias</directive>) to uniquely
     identify a virtual host, when using <a
     href="../vhosts/name-based.html">name-based virtual hosts</a>.</p>
 
+    <p>Additionally, this is used when
+    creating self-referential redirection URLs when 
+    <directive>UseCanonicalName</directive> is set to a non-default
+    value.</p>
+
     <p>For example, if the name of the
     machine hosting the web server is <code>simple.example.com</code>,
     but the machine also has the DNS alias <code>www.example.com</code>