Auto merge of #3598 - pornel:proxyconf, r=alexcrichton

Example proxy config #3596
rust-lang · Jan 27, 2017 · 19dc757 · 19dc757
2 parents 2d5a584 + 1760e2e
commit 19dc757
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/doc/config.md b/src/doc/config.md
@@ -79,7 +79,8 @@ index = "..."   # URL of the registry index (defaults to the central repository)
 token = "..."   # Access token (found on the central repo’s website)
 
 [http]
-proxy = "..."       # HTTP proxy to use for HTTP requests (defaults to none)
+proxy = "host:port" # HTTP proxy to use for HTTP requests (defaults to none)
+                    # in libcurl format, e.g. "socks5h://host:port"
 timeout = 60000     # Timeout for each HTTP request, in milliseconds
 cainfo = "cert.pem" # Path to Certificate Authority (CA) bundle (optional)