summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-01-05 04:36:46 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-01-05 04:36:46 +0100
commit9656ee5d1dbff9fb4e0ce640961d2750a687e629 (patch)
tree6449cb24726aa5d59f31c469a69a0cc3633181d4
parenta5f1e12a023d1c777340058b202d64f466067f30 (diff)
downloadyoutube-dl-9656ee5d1dbff9fb4e0ce640961d2750a687e629.tar.gz
youtube-dl-9656ee5d1dbff9fb4e0ce640961d2750a687e629.tar.xz
youtube-dl-9656ee5d1dbff9fb4e0ce640961d2750a687e629.zip
Document --socket-timeout
-rwxr-xr-xyoutube-dlbin3445 -> 322041 bytes
-rw-r--r--youtube-dl.exebin3803016 -> 0 bytes
-rw-r--r--youtube_dl/__init__.py2
3 files changed, 1 insertions, 1 deletions
diff --git a/youtube-dl b/youtube-dl
index e3eb8774c..79739ca60 100755
--- a/youtube-dl
+++ b/youtube-dl
Binary files differdiff --git a/youtube-dl.exe b/youtube-dl.exe
index 45eee04bb..e69de29bb 100644
--- a/youtube-dl.exe
+++ b/youtube-dl.exe
Binary files differdiff --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')