From: Philipp Hagemeister Date: Tue, 15 Oct 2013 02:52:07 +0000 (+0200) Subject: Merge remote-tracking branch 'alphapapa/master' X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=f219743e33a9a640bfc3845d74282774e51e1ad4;hp=4f41664de8e0486127d8dd16168d829c26f79fdf Merge remote-tracking branch 'alphapapa/master' --- diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 5248a92c7..472ae9c0c 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -267,7 +267,7 @@ def parseOpts(overrideArguments=None): help='languages of the subtitles to download (optional) separated by commas, use IETF language tags like \'en,pt\'') downloader.add_option('-r', '--rate-limit', - dest='ratelimit', metavar='LIMIT', help='maximum download rate (e.g. 50k or 44.6m)') + dest='ratelimit', metavar='LIMIT', help='maximum download rate in bytes per second (e.g. 50k or 44.6m)') downloader.add_option('-R', '--retries', dest='retries', metavar='RETRIES', help='number of retries (default is %default)', default=10) downloader.add_option('--buffer-size',