Merge af983339bf into e1b3fa242c

youtube_dl/YoutubeDL.py

@@ -221,7 +221,8 @@ class YoutubeDL(object):
     listsubtitles:     Lists all available subtitles for the video
     subtitlesformat:   The format code for subtitles
     subtitleslangs:    List of languages of the subtitles to download
-    keepvideo:         Keep the video file after post-processing
+    keepvideo:         Keep original files (videos, subtitles) after post-
+                       processing
     daterange:         A DateRange object, download only if the upload_date is in the range.
     skip_download:     Skip the actual download of the video file
     cachedir:          Location of the cache files in the filesystem.

youtube_dl/options.py

@@ -811,9 +811,9 @@ def parseOpts(overrideArguments=None):
         dest='postprocessor_args', metavar='ARGS',
         help='Give these arguments to the postprocessor (if postprocessing is required)')
     postproc.add_option(
-        '-k', '--keep-video',
+        '-k', '--keep-files', '--keep-video',
         action='store_true', dest='keepvideo', default=False,
-        help='Keep the video file on disk after the post-processing; the video is erased by default')
+        help='Keep original files on disk after the post-processing; original files (videos, subtitles) are erased by default')
     postproc.add_option(
         '--no-post-overwrites',
         action='store_true', dest='nopostoverwrites', default=False,