summaryrefslogtreecommitdiff
path: root/docs/cmdline-opts/socks4a.d
Commit message (Collapse)AuthorAgeFilesLines
* cmdline-opts/socks*: Mention --preproxy in --socks* optsJay Satiro2017-02-091-3/+5
| | | | | | | | | | - Document in --socks* opts they're still mutually exclusive of --proxy. Partial revert of 423a93c; I had misinterpreted the SOCKS proxy + HTTP/HTTPS proxy combination. - Document in --socks* opts that --preproxy can be used to specify a SOCKS proxy at the same time --proxy is used with an HTTP/HTTPS proxy.
* docs: Add more HTTPS proxy documentationJay Satiro2017-02-061-3/+5
| | | | | | | | | | | | - Document HTTPS proxy type. - Document --write-out %{proxy_ssl_verify_result}. - Document SOCKS proxy + HTTP/HTTPS proxy combination. HTTPS proxy support was added in 7.52.0 for OpenSSL, GnuTLS and NSS. Ref: https://github.com/curl/curl/commit/cb4e2be
* cmdline-opts: more command line options documentedDaniel Stenberg2016-11-281-0/+15
Moved over to the new format