From: Daniel Earl Poirier <poirier@apache.org>
Date: Thu, 19 Aug 2010 17:38:18 +0000 (+0000)
Subject: Minor corrections and cleanup in the descriptions of IP-based and
X-Git-Tag: 2.3.8~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb4b4d7ca77f5c2e0a7174f040cc7fdeb0d303d7;p=thirdparty%2Fapache%2Fhttpd.git

Minor corrections and cleanup in the descriptions of IP-based and
name-based virtual hosts.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@987242 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/vhosts/ip-based.xml b/docs/manual/vhosts/ip-based.xml
index e1ea4912a23..a526c632506 100644
--- a/docs/manual/vhosts/ip-based.xml
+++ b/docs/manual/vhosts/ip-based.xml
@@ -31,13 +31,21 @@
 <section id="requirements"><title>System requirements</title>
 
     <p>As the term <cite>IP-based</cite> indicates, the server
-    <strong>must have a different IP address for each IP-based
+    <strong>must have a different IP address/port combination for each IP-based
     virtual host</strong>. This can be achieved by the machine
     having several physical network connections, or by use of
     virtual interfaces which are supported by most modern operating
     systems (see system documentation for details, these are
     frequently called "ip aliases", and the "ifconfig" command is
-    most commonly used to set them up).</p>
+    most commonly used to set them up), and/or using multiple
+    port numbers.</p>
+
+    <p>In many cases, <a href="name-based.html">name-based
+    virtual hosts</a> are more convenient, because they allow
+    many virtual hosts to share a single address/port.
+    See <a href="name-based.html#namevip">Name-based vs. IP-based
+    Virtual Hosts</a> to help you decide.
+    </p>
 
 </section>
 
diff --git a/docs/manual/vhosts/name-based.xml b/docs/manual/vhosts/name-based.xml
index e3453b0722e..3d1b40a66ad 100644
--- a/docs/manual/vhosts/name-based.xml
+++ b/docs/manual/vhosts/name-based.xml
@@ -35,9 +35,11 @@
 
 <section id="namevip"><title>Name-based vs. IP-based Virtual Hosts</title>
 
-    <p>IP-based virtual hosts use the IP address of the connection to
+    <p><a href="ip-based.html">IP-based virtual hosts</a> use the IP address of the connection to
     determine the correct virtual host to serve.  Therefore you need to
-    have a separate IP address for each host.  With name-based virtual
+    have a separate IP address for each host.</p>
+
+    <p>With name-based virtual
     hosting, the server relies on the client to report the hostname as
     part of the HTTP headers.  Using this technique, many different hosts
     can share the same IP address.</p>
@@ -52,7 +54,8 @@
     using IP-based virtual hosting:</p>
 
     <ul>
-       <li>Name-based virtual hosting cannot be used with SSL secure servers
+       <li>Name-based virtual hosting often <a href="../ssl/ssl_faq.html#vhosts">
+        cannot be used with SSL secure servers</a>
         because of the nature of the SSL protocol.</li>
 
         <li>Some operating systems and network equipment implement bandwidth
@@ -80,18 +83,21 @@
 
     <p>To use name-based virtual hosting, you must designate the IP
     address (and possibly port) on the server that will be accepting
-    requests for the hosts.  This is configured using the <directive
+    requests that need to be distinguished by hostname.
+    This is configured using the <directive
     module="core">NameVirtualHost</directive> directive.
     In the normal case where any and all IP addresses on the server should
     be used, you can use <code>*</code> as the argument to <directive
     module="core">NameVirtualHost</directive>. If you're planning to use
     multiple ports (e.g. running SSL) you should add a Port to the argument,
-    such as <code>*:80</code>. Note that mentioning an IP address in a
+    such as <code>*:80</code>.</p>
+
+    <note><p>Note that mentioning an IP address in a
     <directive module="core">NameVirtualHost</directive> directive does not
-    automatically make the server listen to that IP address. See
+    automatically make the server <em>listen</em> to that IP address. See
     <a href="../bind.html">Setting which addresses and ports Apache uses</a>
     for more details. In addition, any IP address specified here must be
-    associated with a network interface on the server.</p>
+    associated with a network interface on the server.</p></note>
 
     <p>The next step is to create a <directive type="section"
     module="core">VirtualHost</directive> block for