[GNUnet-SVN] [gnurl] 234/256: docs: clarify the use of environment variables for proxy

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 46d63bbbe87685b2e9c7380585c03afaa1fcf157
Author: Michael Kaufmann <address@hidden>
AuthorDate: Sun Sep 24 19:58:37 2017 +0200

    docs: clarify the use of environment variables for proxy
    
    Closes #1921
---
 docs/libcurl/opts/CURLOPT_NOPROXY.3 | 5 +++++
 docs/libcurl/opts/CURLOPT_PROXY.3   | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/libcurl/opts/CURLOPT_NOPROXY.3 
b/docs/libcurl/opts/CURLOPT_NOPROXY.3
index a1ee476f6..61500fc05 100644
--- a/docs/libcurl/opts/CURLOPT_NOPROXY.3
+++ b/docs/libcurl/opts/CURLOPT_NOPROXY.3
@@ -41,8 +41,13 @@ If the name in the noproxy list has a leading period, it is 
a domain match
 against the provided host name. This way ".example.com" will switch off proxy
 use for both "www.example.com" as well as for "foo.example.com".
 
+Setting the noproxy string to "" (an empty string) will explicitly enable the
+proxy for all host names, even if there is an environment variable set for it.
+
 The application does not have to keep the string around after setting this
 option.
+.SH "Environment variables"
+See \fICURLOPT_PROXY(3)\fP
 .SH DEFAULT
 NULL
 .SH PROTOCOLS
diff --git a/docs/libcurl/opts/CURLOPT_PROXY.3 
b/docs/libcurl/opts/CURLOPT_PROXY.3
index c543c2c5d..8e93309f1 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY.3
+++ b/docs/libcurl/opts/CURLOPT_PROXY.3
@@ -84,7 +84,8 @@ names to not use a proxy for (even if one of the previous 
mention variables
 are set). That is the exact equivalent of setting the \fICURLOPT_NOPROXY(3)\fP
 option.
 
-The \fICURLOPT_PROXY(3)\fP option overrides environment variables.
+The \fICURLOPT_PROXY(3)\fP and \fICURLOPT_NOPROXY(3)\fP options override
+environment variables.
 .SH DEFAULT
 Default is NULL, meaning no proxy is used.
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden