[options] Update --proxy description for SOCKS proxies

This commit is contained in:
Yen Chi Hsuan 2016-05-08 15:15:58 +08:00
parent fa5cb8d021
commit 6ddb4888d2
No known key found for this signature in database
GPG key ID: 3FDDD575826C5C30

View file

@ -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',