From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 5 Jan 2014 03:36:46 +0000 (+0100)
Subject: Document --socket-timeout
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=9656ee5d1dbff9fb4e0ce640961d2750a687e629;p=youtube-dl

Document --socket-timeout
---

diff --git a/youtube-dl b/youtube-dl
index e3eb8774c..79739ca60 100755
Binary files a/youtube-dl and b/youtube-dl differ
diff --git a/youtube-dl.exe b/youtube-dl.exe
index 45eee04bb..e69de29bb 100644
Binary files a/youtube-dl.exe and b/youtube-dl.exe differ
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index b29cf6758..26c1f0e74 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -192,7 +192,7 @@ def parseOpts(overrideArguments=None):
         help='Disable filesystem caching')
     general.add_option(
         '--socket-timeout', dest='socket_timeout',
-        type=float, default=None, help=optparse.SUPPRESS_HELP)
+        type=float, default=None, help=u'Time to wait before giving up, in seconds')
     general.add_option(
         '--bidi-workaround', dest='bidi_workaround', action='store_true',
         help=u'Work around terminals that lack bidirectional text support. Requires bidiv or fribidi executable in PATH')