]> granicus.if.org Git - curl/commit
cmdline-opts/socks*: Mention --preproxy in --socks* opts
authorJay Satiro <raysatiro@yahoo.com>
Thu, 9 Feb 2017 23:26:16 +0000 (18:26 -0500)
committerJay Satiro <raysatiro@yahoo.com>
Thu, 9 Feb 2017 23:26:16 +0000 (18:26 -0500)
commit7017c421a1683a809c7cc18459a16bafc736626f
treee7507cb2d6583351d546c44a942b18b4d55a916a
parent1dcf2447212996f0772f953f38ac5930ba3311b3
cmdline-opts/socks*: Mention --preproxy in --socks* opts

- 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/cmdline-opts/preproxy.d
docs/cmdline-opts/socks4.d
docs/cmdline-opts/socks4a.d
docs/cmdline-opts/socks5-hostname.d
docs/cmdline-opts/socks5.d