From: David du Colombier <dducolombier@exceliance.fr>
Date: Thu, 17 Mar 2011 09:40:26 +0000 (+0100)
Subject: [DOC] document IPv6 support for server
X-Git-Tag: v1.5-dev8~261
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=486df477e6f0c66aad47e3f2258ab15e058364a0;p=thirdparty%2Fhaproxy.git

[DOC] document IPv6 support for server
---

diff --git a/doc/configuration.txt b/doc/configuration.txt
index d06ad98772..0fdc2ad611 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -4629,7 +4629,7 @@ rspirep <search> <string> [{if | unless} <cond>]  (ignore case)
             manipulation, and section 7 about ACLs.
 
 
-server <name> <address>[:port] [param*]
+server <name> <address>[:[port]] [param*]
   Declare a server in a backend
   May be used in sections :   defaults | frontend | listen | backend
                                  no    |    no    |   yes  |   yes
@@ -4637,10 +4637,10 @@ server <name> <address>[:port] [param*]
     <name>    is the internal name assigned to this server. This name will
               appear in logs and alerts.
 
-    <address> is the IPv4 address of the server. Alternatively, a resolvable
-              hostname is supported, but this name will be resolved during
-              start-up. Address "0.0.0.0" or "*" has a special meaning. It
-              indicates that the connection will be forwarded to the same IP
+    <address> is the IPv4 or IPv6 address of the server. Alternatively, a
+              resolvable hostname is supported, but this name will be resolved
+              during start-up. Address "0.0.0.0" or "*" has a special meaning.
+              It indicates that the connection will be forwarded to the same IP
               address as the one from the client connection. This is useful in
               transparent proxy architectures where the client's connection is
               intercepted and haproxy must forward to the original destination