From: Noirin Plunkett <noirin@apache.org>
Date: Thu, 9 Nov 2006 15:29:16 +0000 (+0000)
Subject: Minor niggles that have been sitting around for a while
X-Git-Tag: 2.3.0~2029
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c668541e8a92ed03c00afc01f1ba5590e67810a5;p=thirdparty%2Fapache%2Fhttpd.git

Minor niggles that have been sitting around for a while


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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 6cf9ede0f40..e1cb5023ad4 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -2547,7 +2547,8 @@ to name-virtual hosts</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
 </table>
     <p>The <code class="directive">ServerAlias</code> directive sets the
-    alternate names for a host, for use with <a href="../vhosts/name-based.html">name-based virtual hosts</a>.</p>
+    alternate names for a host, for use with <a href="../vhosts/name-based.html">name-based virtual hosts</a>. The
+    <code class="directive">ServerAlias</code> may include wildcards, if appropriate.</p>
 
     <div class="example"><p><code>
       &lt;VirtualHost *&gt;<br />
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index ae298023056..3457a48817c 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -2538,7 +2538,8 @@ to name-virtual hosts</description>
 <usage>
     <p>The <directive>ServerAlias</directive> directive sets the
     alternate names for a host, for use with <a
-    href="../vhosts/name-based.html">name-based virtual hosts</a>.</p>
+	    href="../vhosts/name-based.html">name-based virtual hosts</a>. The
+    <directive>ServerAlias</directive> may include wildcards, if appropriate.</p>
 
     <example>
       &lt;VirtualHost *&gt;<br />
diff --git a/docs/manual/vhosts/mass.html.en b/docs/manual/vhosts/mass.html.en
index 4f725d94b0c..8521c99c2e1 100644
--- a/docs/manual/vhosts/mass.html.en
+++ b/docs/manual/vhosts/mass.html.en
@@ -251,6 +251,17 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon<br />
 &lt;/VirtualHost&gt;
 </code></p></div>
 
+<div class="note">
+	<h3>Note</h3>
+	<p>If the first VirtualHost block does <em>not</em> include a
+	<code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> directive, the reverse
+	DNS of the relevant IP will be used instead. 
+	If this is not the server name you
+	wish to use, a bogus entry (<code>ServerName
+	none.example.com</code>) can be added to get around this
+	behaviour.</p>
+</div>	
+
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="ipbased" id="ipbased">More Efficient IP-Based Virtual Hosting</a></h2>
diff --git a/docs/manual/vhosts/mass.xml b/docs/manual/vhosts/mass.xml
index 47d543b5588..2b820694d2c 100644
--- a/docs/manual/vhosts/mass.xml
+++ b/docs/manual/vhosts/mass.xml
@@ -241,6 +241,17 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon<br />
 &lt;/VirtualHost&gt;
 </example>
 
+<note>
+	<title>Note</title>
+	<p>If the first VirtualHost block does <em>not</em> include a
+	<directive module="core">ServerName</directive> directive, the reverse
+	DNS of the relevant IP will be used instead. 
+	If this is not the server name you
+	wish to use, a bogus entry (<code>ServerName
+	none.example.com</code>) can be added to get around this
+	behaviour.</p>
+</note>	
+
 </section>
 
 <section id="ipbased"><title>More Efficient IP-Based Virtual Hosting</title>