[deployment-guide/comm-rel: 600/727] Updated the <VirtualHost> directive description.
Jaromir Hradilek
jhradile at fedoraproject.org
Tue Oct 19 13:16:00 UTC 2010
commit bd3aed6f39a4c5984a8306c7cbe06d6401909e32
Author: Jaromir Hradilek <jhradile at redhat.com>
Date: Mon Sep 6 18:36:13 2010 +0200
Updated the <VirtualHost> directive description.
en-US/The_Apache_HTTP_Server.xml | 84 ++++++++++++++++++++++++++++---------
1 files changed, 63 insertions(+), 21 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index a4ed406..3823485 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -236,7 +236,7 @@ httpd (pid 19014) is running...</screen>
<term><option><Directory></option></term>
<listitem>
<para>
- The <option><Directory></option> directive allows you to apply certain directives to the selected directory only. It takes the following form:
+ The <option><Directory></option> directive allows you to apply certain directives to a particular directory only. It takes the following form:
</para>
<screen><Directory <replaceable>directory</replaceable>>
<replaceable>directive</replaceable>
@@ -263,7 +263,7 @@ httpd (pid 19014) is running...</screen>
<term><option><IfDefine></option></term>
<listitem>
<para>
- The <option>IfDefine</option> directive allows you to use certain directives only when the selected parameter is supplied on the command line. It takes the following form:
+ The <option>IfDefine</option> directive allows you to use certain directives only when a particular parameter is supplied on the command line. It takes the following form:
</para>
<screen><IfDefine <optional>!</optional><replaceable>parameter</replaceable>>
<replaceable>directive</replaceable>
@@ -284,7 +284,7 @@ httpd (pid 19014) is running...</screen>
<term><option><IfModule></option></term>
<listitem>
<para>
- The <option><IfModule></option> directive allows you to use certain directive only when the specified module is loaded. It takes the following form:
+ The <option><IfModule></option> directive allows you to use certain directive only when a particular module is loaded. It takes the following form:
</para>
<screen><IfModule <optional>!</optional><replaceable>module</replaceable>>
<replaceable>directive</replaceable>
@@ -306,7 +306,7 @@ httpd (pid 19014) is running...</screen>
<term><option><Location></option></term>
<listitem>
<para>
- The <option><Location></option> directive allows you to apply certain directives to the selected URL only. It takes the following form:
+ The <option><Location></option> directive allows you to apply certain directives to a particular URL only. It takes the following form:
</para>
<screen><Location <replaceable>url</replaceable>>
<replaceable>directive</replaceable>
@@ -350,6 +350,63 @@ httpd (pid 19014) is running...</screen>
</listitem>
</varlistentry>
<varlistentry>
+ <term><option><VirtualHost></option></term>
+ <listitem>
+ <para>
+ The <option><VirtualHost></option> directive allows you apply certain directives to particular virtual hosts only. It takes the following form:
+ </para>
+ <screen><VirtualHost <replaceable>address</replaceable><optional>:<replaceable>port</replaceable></optional>…></screen>
+ <para>
+ The <replaceable>address</replaceable> can be an IP address, a fully qualified domain name, or a special form as described in <xref linkend="table-apache-httpdconf-virtualhost" />.
+ </para>
+ <table id="table-apache-httpdconf-virtualhost">
+ <title>Available <option><VirtualHost></option> options</title>
+ <tgroup cols="2">
+ <colspec colname="option" colnum="1" colwidth="20*" />
+ <colspec colname="description" colnum="2" colwidth="60*" />
+ <thead>
+ <row>
+ <entry>
+ Option
+ </entry>
+ <entry>
+ Description
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <option>*</option>
+ </entry>
+ <entry>
+ Represents all IP addresses.
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <option>_default_</option>
+ </entry>
+ <entry>
+ Represents unmatched IP addresses.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ <example id="example-apache-httpdconf-virtualhost">
+ <title>Using the <option><VirtualHost></option> directive</title>
+ <screen><VirtualHost *:80>
+ ServerAdmin webmaster at penguin.example.com
+ DocumentRoot /www/docs/penguin.example.com
+ ServerName penguin.example.com
+ ErrorLog logs/penguin.example.com-error_log
+ CustomLog logs/penguin.example.com-access_log common
+</VirtualHost></screen>
+ </example>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><option>AccessFileName</option></term>
<listitem>
<para>
@@ -2540,29 +2597,14 @@ ErrorDocument 404 /404-not_found.html</screen>
</listitem>
</varlistentry>
</variablelist>
- <formalpara id="s2-apache-virtualhost">
- <title>VirtualHost</title>
- <indexterm>
- <primary><command>VirtualHost</command></primary>
- <secondary>Apache configuration directive</secondary>
- </indexterm>
- <indexterm>
- <primary>configuration directives, Apache</primary>
- <secondary><command>VirtualHost</command></secondary>
- </indexterm>
- <para>
- <command><VirtualHost></command> and <command></VirtualHost></command> tags create a container outlining the characteristics of a virtual host. The <command>VirtualHost</command> container accepts most configuration directives.
- </para>
- </formalpara>
- <para>
- A commented <command>VirtualHost</command> container is provided in <filename>httpd.conf</filename>, which illustrates the minimum set of configuration directives necessary for each virtual host. Refer to <xref linkend="s1-apache-virtualhosts" /> for more information about virtual hosts.
- </para>
+ <!-- TODO: Move the following admonition elsewhere.
<note>
<title>Note</title>
<para>
The default SSL virtual host container now resides in the file <filename>/etc/httpd/conf.d/ssl.conf</filename>.
</para>
</note>
+ -->
</section>
<section id="s2-apache-sslconf-common">
<title>Common <filename>ssl.conf</filename> Directives</title>
More information about the docs-commits
mailing list