Fix help for --proxy

diff --git a/README.md b/README.md
index 5e4c13dc725704365ed06c6abe8fc3bc6b732d80..7288f4dd36227bc97c96326369ad6256f9ddeb0b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ which means you can modify it, redistribute it or use it however you like.
                                is restricted to one domain
     --list-extractors          List all supported extractors and the URLs they
                                would handle
-    --proxy None               Use the specified HTTP/HTTPS proxy
+    --proxy URL                Use the specified HTTP/HTTPS proxy
 
 ## Video Selection:
     --playlist-start NUMBER    playlist video to start at (default is 1)

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index a56da8e3dd8d3d4d60ac233b1f769fce502d3947..27f36c6adb852d34d4b70b4ba5fc9ba9257da244 100644 (file)
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -146,7 +146,7 @@ def parseOpts(overrideArguments=None):
     general.add_option('--list-extractors',
             action='store_true', dest='list_extractors',
             help='List all supported extractors and the URLs they would handle', default=False)
-    general.add_option('--proxy', dest='proxy', default=None, help='Use the specified HTTP/HTTPS proxy')
+    general.add_option('--proxy', dest='proxy', default=None, help='Use the specified HTTP/HTTPS proxy', metavar='URL')
     general.add_option('--test', action='store_true', dest='test', default=False, help=optparse.SUPPRESS_HELP)
 
     selection.add_option('--playlist-start',