From f00f965c43b900d438f0e2ebb9c706e9dfe8cbc7 Mon Sep 17 00:00:00 2001 From: Seth Prime Date: Wed, 1 Nov 2017 21:47:12 -0300 Subject: [PATCH] Update description of proxy help in options.p to include using HTTP/HTTPS --- youtube_dl/options.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/youtube_dl/options.py b/youtube_dl/options.py index c1ff1430c..5fadfd7ac 100644 --- a/youtube_dl/options.py +++ b/youtube_dl/options.py @@ -203,11 +203,12 @@ def parseOpts(overrideArguments=None): network.add_option( '--proxy', dest='proxy', default=None, metavar='URL', - help='Use the specified HTTP/HTTPS/SOCKS proxy. To enable experimental ' - 'SOCKS proxy, specify a proper scheme. For example ' - 'socks5://hostname:port/ or socks5://username:password@hostname:port/ ' - 'for username and password authentication. Pass in an empty string ' - '(--proxy "") for direct connection.') + help='Use the specified HTTP/HTTPS/SOCKS proxy. To enable HTTP/HTTPS ' + 'or experimental SOCKS proxy, specify a proper scheme. For example ' + 'protocol://hostname:port/ or protocol://username:password@hostname:port/ ' + 'for username and password authentication. The protocol attribute ' + 'can be exchanged with a string like http, https or socks5. Pass ' + 'in an empty string (--proxy "") for direct connection.') network.add_option( '--socket-timeout', dest='socket_timeout', type=float, default=None, metavar='SECONDS',