httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject svn commit: r561886 - in /httpd/httpd/branches/2.2.x/docs/manual: mod/core.html.en mod/core.xml mod/core.xml.de programs/httpd.xml.ko vhosts/mass.html.en vhosts/mass.xml
Date Wed, 01 Aug 2007 17:39:40 GMT
Author: slive
Date: Wed Aug  1 10:39:32 2007
New Revision: 561886

URL: http://svn.apache.org/viewvc?view=rev&rev=561886
Log:
Merge r472949 from trunk:

Minor niggles that have been sitting around for a while


Modified:
    httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en
    httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de
    httpd/httpd/branches/2.2.x/docs/manual/programs/httpd.xml.ko
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/mass.html.en
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/mass.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en?view=diff&rev=561886&r1=561885&r2=561886
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en Wed Aug  1 10:39:32 2007
@@ -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 @@
 <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 @@
 <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>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml?view=diff&rev=561886&r1=561885&r2=561886
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml Wed Aug  1 10:39:32 2007
@@ -2748,7 +2748,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/branches/2.2.x/docs/manual/mod/core.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de?view=diff&rev=561886&r1=561885&r2=561886
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de Wed Aug  1 10:39:32 2007
@@ -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

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/httpd.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/httpd.xml.ko?view=diff&rev=561886&r1=561885&r2=561886
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/httpd.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/httpd.xml.ko [euc-kr] Wed Aug  1 10:39:32
2007
@@ -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

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/mass.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/mass.html.en?view=diff&rev=561886&r1=561885&r2=561886
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/mass.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/mass.html.en Wed Aug  1 10:39:32 2007
@@ -253,6 +253,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/branches/2.2.x/docs/manual/vhosts/mass.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/mass.xml?view=diff&rev=561886&r1=561885&r2=561886
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/mass.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/mass.xml Wed Aug  1 10:39:32 2007
@@ -251,6 +251,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