httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From noi...@apache.org
Subject svn commit: r472949 - in /httpd/httpd/trunk/docs/manual: mod/core.html.en mod/core.xml vhosts/mass.html.en vhosts/mass.xml
Date Thu, 09 Nov 2006 15:29:17 GMT
Author: noirin
Date: Thu Nov  9 07:29:16 2006
New Revision: 472949

URL: http://svn.apache.org/viewvc?view=rev&rev=472949
Log:
Minor niggles that have been sitting around for a while

Modified:
    httpd/httpd/trunk/docs/manual/mod/core.html.en
    httpd/httpd/trunk/docs/manual/mod/core.xml
    httpd/httpd/trunk/docs/manual/vhosts/mass.html.en
    httpd/httpd/trunk/docs/manual/vhosts/mass.xml

Modified: httpd/httpd/trunk/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.html.en?view=diff&rev=472949&r1=472948&r2=472949
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.en Thu Nov  9 07:29:16 2006
@@ -2547,7 +2547,8 @@
 <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 />

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml?view=diff&rev=472949&r1=472948&r2=472949
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml Thu Nov  9 07:29:16 2006
@@ -2538,7 +2538,8 @@
 <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 />

Modified: httpd/httpd/trunk/docs/manual/vhosts/mass.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/mass.html.en?view=diff&rev=472949&r1=472948&r2=472949
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/mass.html.en (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/mass.html.en Thu Nov  9 07:29:16 2006
@@ -251,6 +251,17 @@
 &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>

Modified: httpd/httpd/trunk/docs/manual/vhosts/mass.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/mass.xml?view=diff&rev=472949&r1=472948&r2=472949
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/mass.xml (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/mass.xml Thu Nov  9 07:29:16 2006
@@ -241,6 +241,17 @@
 &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>



Mime
View raw message