[deployment-guide/comm-rel: 528/727] Updated the NameVirtualHost directive description.

[Jaromir Hradilek]

commit 5da0783460a69bfdb6072a40c6088f5741a30636
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Tue Aug 31 16:01:35 2010 +0200

    Updated the NameVirtualHost directive description.

 en-US/The_Apache_HTTP_Server.xml |   48 +++++++++++++++++++------------------
 1 files changed, 25 insertions(+), 23 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index 37652f9..a080cec 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -1438,6 +1438,31 @@ ErrorDocument 404 /404-not_found.html</screen>
             </example>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term><option>NameVirtualHost</option></term>
+          <listitem>
+            <para>
+              The <option>NameVirtualHost</option> directive allows you to specify the IP address and port number for a name-based virtual host. It takes the following form:
+            </para>
+            <screen>NameVirtualHost <replaceable>ip-address</replaceable>[:<replaceable>port</replaceable>]</screen>
+            <para>
+              The <replaceable>ip-address</replaceable> can be either a full IP address, or an asterisk (that is, <literal>*</literal>) representing all interfaces. Note that IPv6 addresses have to be enclosed in square brackets (that is, <literal>[</literal> and <literal>]</literal>). The <replaceable>port</replaceable> is optional.
+            </para>
+            <para>
+              Name-based virtual hosting allows one Apache HTTP Server to serve different domains without using multiple IP addresses.
+            </para>
+            <important>
+              <title>Important: Using Secure HTTP Connections</title>
+              <para>
+                Name-based virtual hosts <emphasis>only</emphasis> work with non-secure HTTP connections. If using virtual hosts with a secure server, use IP address-based virtual hosts instead.
+              </para>
+            </important>
+            <example id="example-apache-httpdconf-namevirtualhost">
+              <title>Using the <option>NameVirtualHost</option> directive</title>
+              <screen>NameVirtualHost *:80</screen>
+            </example>
+          </listitem>
+        </varlistentry>
       </variablelist>
       <formalpara id="s2-apache-indexoptions">
         <title>IndexOptions</title>
@@ -1465,29 +1490,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-namevirtualhost">
-        <title>NameVirtualHost</title>
-        <indexterm>
-          <primary><command>NameVirtualHost</command></primary>
-          <secondary>Apache configuration directive</secondary>
-        </indexterm>
-        <indexterm>
-          <primary>configuration directives, Apache</primary>
-          <secondary><command>NameVirtualHost</command></secondary>
-        </indexterm>
-        <para>
-          The <command>NameVirtualHost</command> directive associates an IP address and port number, if necessary, for any name-based virtual hosts. Name-based virtual hosting allows one Apache HTTP Server to serve different domains without using multiple IP addresses.
-        </para>
-      </formalpara>
-      <note>
-        <title>Note</title>
-        <para>
-          Name-based virtual hosts <emphasis>only</emphasis> work with non-secure HTTP connections. If using virtual hosts with a secure server, use IP address-based virtual hosts instead.
-        </para>
-      </note>
-      <para>
-        To enable name-based virtual hosting, uncomment the <command>NameVirtualHost</command> configuration directive and add the correct IP address. Then add additional <command>VirtualHost</command> containers for each virtual host as is necessary for your configuration.
-      </para>
       <formalpara id="s2-apache-options">
         <title>Options</title>
         <indexterm>