ignored intellij related files

[youtube-dl] / youtube_dl / options.py

diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index d1f8d1331cf153a58a42b4220ebe37b441f3df4b..38efd292d2a70632eca7ebbade6df66f934d8e10 100644 (file)
--- 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',