There is no longer any need for different Listen directives to

use mapped/non-mapped addresses.  Also cleared up that not all
platforms support v6-only sockets.

Submitted by:  Colm MacCarthaigh <colm@stdlib.net>

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

diff --git a/docs/manual/bind.html.en b/docs/manual/bind.html.en
index 6fa040244a4788080f4045b9901a0b63d9a1a4d9..f5452df3613a37558d6a42acc82c5ac89ae4d737 100644 (file)
--- a/docs/manual/bind.html.en
+++ b/docs/manual/bind.html.en
@@ -98,18 +98,14 @@
     platforms.  But even on systems where it is disallowed by default, a 
     special configure parameter can change this behavior for Apache.</p>
 
-    <p>If you want Apache to handle IPv4 and IPv6 connections with a 
-    minimum of sockets, which requires using IPv4-mapped IPv6 addresses, 
-    specify the <code>--enable-v4-mapped</code> configure option and use 
-    generic Listen directives like the following:</p>
-
-    <div class="example"><p><code>
-      Listen 80
-    </code></p></div>
-
-    <p>With <code>--enable-v4-mapped</code>, the Listen directives in the 
-    default configuration file created by Apache will use this form.  
-    <code>--enable-v4-mapped</code> is the default on all platforms but 
+    <p>On the other hand, on some platforms such as Linux and Tru64 the 
+    <strong>only</strong> way to handle both IPv6 and IPv4 is to use 
+    mapped addresses. If you want Apache to handle IPv4 and IPv6 connections 
+    with a minimum of sockets, which requires using IPv4-mapped IPv6 
+    addresses, specify the <code>--enable-v4-mapped</code> configure 
+    option.</p>
+
+    <p><code>--enable-v4-mapped</code> is the default on all platforms but 
     FreeBSD, NetBSD, and OpenBSD, so this is probably how your Apache was 
     built.</p>
 
@@ -122,21 +118,11 @@
       Listen 192.170.2.1:80
     </code></p></div>
 
-    <p>If you want Apache to handle IPv4 and IPv6 connections on separate 
-    sockets (i.e., to disable IPv4-mapped addresses), specify the 
-    <code>--disable-v4-mapped</code> configure option and use specific Listen 
-    directives like the following:</p>
-
-    <div class="example"><p><code>
-      Listen [::]:80<br />
-      Listen 0.0.0.0:80
-    </code></p></div>
-
-    <p>With <code>--disable-v4-mapped</code>, the Listen directives in the 
-    default configuration file created by Apache will use this form.  
-    <code>--disable-v4-mapped</code> is the default on FreeBSD, NetBSD, and 
-    OpenBSD.</p>
-
+    <p>If your platform supports it and you want Apache to handle IPv4 and 
+    IPv6  connections on separate sockets (i.e., to disable IPv4-mapped 
+    addresses), specify the <code>--disable-v4-mapped</code> configure 
+    option. <code>--disable-v4-mapped</code> is the default on FreeBSD, 
+    NetBSD, and OpenBSD.</p>
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="virtualhost" id="virtualhost">How This Works With Virtual Hosts</a></h2>

diff --git a/docs/manual/bind.xml b/docs/manual/bind.xml
index efd9dedf09a9b74075bde888c3ef4ed8e8ebb3ac..020ae696e890cff832c209344b7be6c7b7fefb90 100644 (file)
--- a/docs/manual/bind.xml
+++ b/docs/manual/bind.xml
@@ -89,18 +89,14 @@
     platforms.  But even on systems where it is disallowed by default, a 
     special configure parameter can change this behavior for Apache.</p>
 
-    <p>If you want Apache to handle IPv4 and IPv6 connections with a 
-    minimum of sockets, which requires using IPv4-mapped IPv6 addresses, 
-    specify the <code>--enable-v4-mapped</code> configure option and use 
-    generic Listen directives like the following:</p>
-
-    <example>
-      Listen 80
-    </example>
-
-    <p>With <code>--enable-v4-mapped</code>, the Listen directives in the 
-    default configuration file created by Apache will use this form.  
-    <code>--enable-v4-mapped</code> is the default on all platforms but 
+    <p>On the other hand, on some platforms such as Linux and Tru64 the 
+    <strong>only</strong> way to handle both IPv6 and IPv4 is to use 
+    mapped addresses. If you want Apache to handle IPv4 and IPv6 connections 
+    with a minimum of sockets, which requires using IPv4-mapped IPv6 
+    addresses, specify the <code>--enable-v4-mapped</code> configure 
+    option.</p>
+
+    <p><code>--enable-v4-mapped</code> is the default on all platforms but 
     FreeBSD, NetBSD, and OpenBSD, so this is probably how your Apache was 
     built.</p>
 
@@ -113,21 +109,11 @@
       Listen 192.170.2.1:80
     </example>
 
-    <p>If you want Apache to handle IPv4 and IPv6 connections on separate 
-    sockets (i.e., to disable IPv4-mapped addresses), specify the 
-    <code>--disable-v4-mapped</code> configure option and use specific Listen 
-    directives like the following:</p>
-
-    <example>
-      Listen [::]:80<br />
-      Listen 0.0.0.0:80
-    </example>
-
-    <p>With <code>--disable-v4-mapped</code>, the Listen directives in the 
-    default configuration file created by Apache will use this form.  
-    <code>--disable-v4-mapped</code> is the default on FreeBSD, NetBSD, and 
-    OpenBSD.</p>
-
+    <p>If your platform supports it and you want Apache to handle IPv4 and 
+    IPv6  connections on separate sockets (i.e., to disable IPv4-mapped 
+    addresses), specify the <code>--disable-v4-mapped</code> configure 
+    option. <code>--disable-v4-mapped</code> is the default on FreeBSD, 
+    NetBSD, and OpenBSD.</p>
   </section>
 
   <section id="virtualhost">