From: Rich Bowen <rbowen@apache.org>
Date: Mon, 18 Oct 2010 15:37:02 +0000 (+0000)
Subject: Additional comment about the role of ServerName
X-Git-Tag: 2.2.18~370
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=378bc9c8df06bbbcd0b87794c00a65406b877702;p=thirdparty%2Fapache%2Fhttpd.git

Additional comment about the role of ServerName


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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 9bc883fd556..b9ef2ef2605 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -2864,7 +2864,13 @@ itself</td></tr>
     <p>The <code class="directive">ServerName</code> directive sets the
     request scheme, hostname and
     port that the server uses to identify itself.  This is used when
-    creating redirection URLs. For example, if the name of the
+    creating redirection URLs.</p>
+
+    <p>Additionally, <code class="directive">ServerName</code> is used (possibly
+    in conjunction with <code class="directive">ServerAlias</code>) to uniquely
+    identify a virtual host, when using <a href="../vhosts/name-based.html">name-based virtual hosts</a>.</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>
     and you wish the web server to be so identified, the following
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index a4fa22d2ea5..c541108c071 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -2851,7 +2851,13 @@ itself</description>
     <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. For example, if the name of the
+    creating redirection URLs.</p>
+
+    <p>Additionally, <code class="directive">ServerName</code> is used (possibly
+    in conjunction with <code class="directive">ServerAlias</code>) to uniquely
+    identify a virtual host, when using <a href="../vhosts/name-based.html">name-based virtual hosts</a>.</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>
     and you wish the web server to be so identified, the following