From: Rich Bowen <rbowen@apache.org>
Date: Mon, 18 Oct 2010 15:26:57 +0000 (+0000)
Subject: Add teensy clarification to the introductory paragraph for the
X-Git-Tag: 2.3.9~280
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=726f4ce5d8b1e34d848b21e86ffd61aea01eb3f5;p=apache

Add teensy clarification to the introductory paragraph for the
ServerName directive.


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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 35925eac2a..29eb9590db 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -3300,7 +3300,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 2d354955c8..da653ddbf7 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -3298,7 +3298,14 @@ 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, <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>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