From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 3 Dec 2013 12:33:07 +0000 (+0100)
Subject: Document disabling proxy (#1882)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=cf6758d2040816033ec47afe9c1d497e4c2abd4d;p=youtube-dl

Document disabling proxy (#1882)
---

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index fff295e8c..d2446b670 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -191,7 +191,9 @@ def parseOpts(overrideArguments=None):
     general.add_option('--extractor-descriptions',
             action='store_true', dest='list_extractor_descriptions',
             help='Output descriptions of all supported extractors', default=False)
-    general.add_option('--proxy', dest='proxy', default=None, help='Use the specified HTTP/HTTPS proxy', metavar='URL')
+    general.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')
     general.add_option('--no-check-certificate', action='store_true', dest='no_check_certificate', default=False, help='Suppress HTTPS certificate validation.')
     general.add_option(
         '--cache-dir', dest='cachedir', default=get_cachedir(), metavar='DIR',