docs: CURLOPT_RESOLVE overrides CURLOPT_IPRESOLVE

diff --git a/docs/curl.1 b/docs/curl.1
index 0c183c1dedfa2626897b23484c00732fdeed8609..f2d48f1710616a3098b6bf3f26ba68da46a0fc0e 100644 (file)
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -1585,6 +1585,9 @@ the number used for the specific protocol the host will be used for. It means
 you need several entries if you want to provide address for the same host but
 different ports.
 
+The provided address set by this option will be used even if \fI-4, --ipv4\fP
+or \fI-6, --ipv6\fP is set to make curl use another IP version.
+
 This option can be used many times to add many host names to resolve.
 
 (Added in 7.21.3)

diff --git a/docs/libcurl/opts/CURLOPT_RESOLVE.3 b/docs/libcurl/opts/CURLOPT_RESOLVE.3
index 028341ed231c5975c373ebe7c2d1b14b7a6bb8ef..6f31216c9b0e1eba0514a2284c8a0f7ae04f50e8 100644 (file)
--- a/docs/libcurl/opts/CURLOPT_RESOLVE.3
+++ b/docs/libcurl/opts/CURLOPT_RESOLVE.3
@@ -48,11 +48,13 @@ HOST+PORT will instead use your provided ADDRESS. Addresses set with
 \fICURLOPT_RESOLVE(3)\fP will not time-out from the DNS cache like ordinary
 entries.
 
+The provided ADDRESS set by this option will be used even if
+\cICURLOPT_IPRESOLVE(3)\fP is set to make libcurl use another IP version.
+
 Remove names from the DNS cache again, to stop providing these fake resolves,
 by including a string in the linked list that uses the format
 \&"-HOST:PORT". The host name must be prefixed with a dash, and the host name
-and port number must exactly match what was already added previously. (Added
-in 7.42.0)
+and port number must exactly match what was already added previously.
 .SH DEFAULT
 NULL
 .SH PROTOCOLS