From: Yen Chi Hsuan Date: Sun, 8 May 2016 07:15:58 +0000 (+0800) Subject: [options] Update --proxy description for SOCKS proxies X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=6ddb4888d2610df3bbb5024440caddde50fe9ad8;p=youtube-dl [options] Update --proxy description for SOCKS proxies --- diff --git a/youtube_dl/options.py b/youtube_dl/options.py index d1f8d1331..38efd292d 100644 --- a/youtube_dl/options.py +++ b/youtube_dl/options.py @@ -188,7 +188,10 @@ def parseOpts(overrideArguments=None): network.add_option( '--proxy', dest='proxy', default=None, metavar='URL', - help='Use the specified HTTP/HTTPS proxy. Pass in an empty string (--proxy "") for direct connection') + help='Use the specified HTTP/HTTPS/SOCKS proxy. To enable experimental ' + 'SOCKS proxy, specify a proper scheme. For example ' + 'socks5://127.0.0.1:1080/. Pass in an empty string (--proxy "") ' + 'for direct connection') network.add_option( '--socket-timeout', dest='socket_timeout', type=float, default=None, metavar='SECONDS',