[deployment-guide/comm-rel: 582/727] Moved the VirtualHosts tag description.
Jaromir Hradilek
jhradile at fedoraproject.org
Tue Oct 19 13:13:56 UTC 2010
commit 6f1dc31907912623ab140cf0d748c2e419b9d474
Author: Jaromir Hradilek <jhradile at redhat.com>
Date: Fri Sep 3 19:43:59 2010 +0200
Moved the VirtualHosts tag description.
en-US/The_Apache_HTTP_Server.xml | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index 1a49ff6..e50051d 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -2220,20 +2220,6 @@ ErrorDocument 404 /404-not_found.html</screen>
<para>
<command>IndexOptions</command> has a number of other parameters which can be set to control the appearance of server generated directories. The <command>IconHeight</command> and <command>IconWidth</command> parameters require the server to include HTML <command>HEIGHT</command> and <command>WIDTH</command> tags for the icons in server generated webpages. The <command>IconsAreLinks</command> parameter combines the graphical icon with the HTML link anchor, which contains the URL link target.
</para>
- <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>
@@ -2363,6 +2349,29 @@ ErrorDocument 404 /404-not_found.html</screen>
<command><Proxy *></command> and <command></Proxy></command> tags create a container which encloses a group of configuration directives meant to apply only to the proxy server. Many directives which are allowed within a <command><Directory></command> container may also be used within <command><Proxy></command> container.
</para>
</formalpara>
+ <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>
+ <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-sslcommands">
<title>Configuration Directives for SSL</title>
More information about the docs-commits
mailing list