From: Joshua Slive <slive@apache.org>
Date: Wed, 1 Aug 2007 17:39:32 +0000 (+0000)
Subject: Merge r472949 from trunk:
X-Git-Tag: 2.2.5~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8306ee5f61779b756227273e0e3df3adfc35fd9;p=thirdparty%2Fapache%2Fhttpd.git

Merge r472949 from trunk:

Minor niggles that have been sitting around for a while



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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index e88e3ba7783..60020d1506b 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -23,7 +23,7 @@
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/core.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="">&nbsp;ja&nbsp;</a></p>
+<a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Core Apache HTTP Server features that are always
 available</td></tr>
@@ -2758,7 +2758,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 />
@@ -3395,7 +3396,7 @@ hostname or IP address</td></tr>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/core.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="">&nbsp;ja&nbsp;</a></p>
+<a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
 <p class="apache">Copyright 2006 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 65f3237a3bc..52c3f19b18c 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -2748,7 +2748,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/mod/core.xml.de b/docs/manual/mod/core.xml.de
index fc194406df9..365dc1d34ae 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 167959:559990 (outdated) -->
+<!-- English Revision: 167959:560011 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/programs/httpd.xml.ko b/docs/manual/programs/httpd.xml.ko
index 83284e11248..882ea24d583 100644
--- a/docs/manual/programs/httpd.xml.ko
+++ b/docs/manual/programs/httpd.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:421100 (outdated) -->
+<!-- English Revision: 105989:561800 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/mass.html.en b/docs/manual/vhosts/mass.html.en
index 25b2fe51a55..c893208ee90 100644
--- a/docs/manual/vhosts/mass.html.en
+++ b/docs/manual/vhosts/mass.html.en
@@ -253,6 +253,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 9b3cfebd4a7..4214c33aa36 100644
--- a/docs/manual/vhosts/mass.xml
+++ b/docs/manual/vhosts/mass.xml
@@ -251,6 +251,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>