diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2016-05-08 15:15:58 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2016-05-10 14:51:38 +0800 |
| commit | 6ddb4888d2610df3bbb5024440caddde50fe9ad8 (patch) | |
| tree | 09c0e8651ce44c4328c4302dfff10e6dc677185d /youtube_dl/options.py | |
| parent | fa5cb8d0212918657cb58b4d5791ed3de831bd74 (diff) | |
[options] Update --proxy description for SOCKS proxies
Diffstat (limited to 'youtube_dl/options.py')
| -rw-r--r-- | youtube_dl/options.py | 5 |
1 files changed, 4 insertions, 1 deletions
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', |