From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 3 Apr 2013 13:39:38 +0000 (+0200)
Subject: curl_easy_setopt.3: CURLOPT_HTTPGET disables CURLOPT_UPLOAD
X-Git-Tag: curl-7_30_0~64
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=962eb3d9eda88ec364526b2ad04eda03884bcc9d;p=thirdparty%2Fcurl.git

curl_easy_setopt.3: CURLOPT_HTTPGET disables CURLOPT_UPLOAD
---

diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3
index ed7e4dbbaa..3297f83914 100644
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -1485,7 +1485,7 @@ to GET. Usable if a POST, HEAD, PUT, or a custom request has been used
 previously using the same curl handle.
 
 When setting \fICURLOPT_HTTPGET\fP to 1, it will automatically set
-\fICURLOPT_NOBODY\fP to 0 (since 7.14.1).
+\fICURLOPT_NOBODY\fP to 0 and \fICURLOPT_UPLOAD\fP to 0.
 .IP CURLOPT_HTTP_VERSION
 Pass a long, set to one of the values described below. They force libcurl to
 use the specific HTTP versions. This is not sensible to do unless you have a