3 commits

Author	SHA1	Message	Date
Emil Engler	5dddc1dc7e	docs: add categories to all cmdline opts ... Adapted gen.pl with 'listcats' This commit is a part of "--help me if you can" Closes #5680	2020-09-04 15:38:14 +02:00
Jay Satiro	7017c421a1	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.	2017-02-09 18:26:16 -05:00
Daniel Stenberg	845522cadb	preproxy: renamed what was added as SOCKS_PROXY ... CURLOPT_SOCKS_PROXY -> CURLOPT_PRE_PROXY Added the corresponding --preroxy command line option. Sets a SOCKS proxy to connect to _before_ connecting to a HTTP(S) proxy.	2016-12-16 16:04:23 +01:00