From: Baptiste Assmann <bedis9@gmail.com>
Date: Tue, 4 Aug 2015 20:43:06 +0000 (+0200)
Subject: DOC: resolve-prefer default value and default-server update
X-Git-Tag: v1.6-dev4~122
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4aabae0e934404558a329776590d912343fa1b8;p=thirdparty%2Fhaproxy.git

DOC: resolve-prefer default value and default-server update

By the code, resolve-prefer defaults to IPv6 and is also available in
the default-server directive.
These information were missing or wrong in the documentation.
---

diff --git a/doc/configuration.txt b/doc/configuration.txt
index c4060ce7a6..8a59638dde 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -10097,7 +10097,9 @@ resolve-prefer <family>
   from the family mentioned in the "resolve-prefer" parameter.
   Available families: "ipv4" and "ipv6"
 
-  Default value: ipv4
+  Default value: ipv6
+
+  Supported in default-server: Yes
 
   Example: server s1 app1.domain.com:80 resolvers mydns resolve-prefer ipv6