Document --socket-timeout

diff --git a/youtube-dl b/youtube-dl
index e3eb8774caa258ddbaa51323938fbd36c4fc170d..79739ca6026fca3eefbada3428d3ef2734a720cb 100755 (executable)
Binary files a/youtube-dl and b/youtube-dl differ

diff --git a/youtube-dl.exe b/youtube-dl.exe
index 45eee04bbda9c816a80c467f0215512cd6bc95a6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
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 b29cf6758d0354e6ff34b8823ea1606544a7f5a1..26c1f0e74b71b2d407b2803c932d789c5880d249 100644 (file)
--- 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')