diff options
| author | Noirin Plunkett <noirin@apache.org> | 2006-11-09 15:29:16 +0000 |
|---|---|---|
| committer | Noirin Plunkett <noirin@apache.org> | 2006-11-09 15:29:16 +0000 |
| commit | c668541e8a92ed03c00afc01f1ba5590e67810a5 (patch) | |
| tree | f8d9c6dda1f1f0390674b9d79f755d702e6bc712 /docs | |
| parent | 9adc40117cb83464b62badfd922fa4848cba9ba2 (diff) | |
| download | httpd-c668541e8a92ed03c00afc01f1ba5590e67810a5.tar.gz | |
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
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/manual/mod/core.html.en | 3 | ||||
| -rw-r--r-- | docs/manual/mod/core.xml | 3 | ||||
| -rw-r--r-- | docs/manual/vhosts/mass.html.en | 11 | ||||
| -rw-r--r-- | docs/manual/vhosts/mass.xml | 11 |
4 files changed, 26 insertions, 2 deletions
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 6cf9ede0f4..e1cb5023ad 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> <VirtualHost *><br /> diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index ae29802305..3457a48817 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> <VirtualHost *><br /> diff --git a/docs/manual/vhosts/mass.html.en b/docs/manual/vhosts/mass.html.en index 4f725d94b0..8521c99c2e 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 /> </VirtualHost> </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 47d543b558..2b820694d2 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 /> </VirtualHost> </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> |