X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Foptions.py;h=e7d0676425678072e2828a36f903f4b6147c798e;hb=82ea1051b54134150f290d3d9f259a4baf54faf4;hp=096ab6137460e2298a5a1fa17eb81a36de65be32;hpb=d22dec74ffa2a53a1c04770af37d39f384f3d56c;p=youtube-dl

diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 096ab6137..e7d067642 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -351,7 +351,8 @@ def parseOpts(overrideArguments=None):
         '--merge-output-format',
         action='store', dest='merge_output_format', metavar='FORMAT', default=None,
         help=(
-            'If a merge is required (e.g. bestvideo+bestaudio), output to given container format. One of mkv, mp4, ogg, webm, flv.'
+            'If a merge is required (e.g. bestvideo+bestaudio), '
+            'output to given container format. One of mkv, mp4, ogg, webm, flv. '
             'Ignored if no merge is required'))
 
     subtitles = optparse.OptionGroup(parser, 'Subtitle Options')
@@ -729,7 +730,7 @@ def parseOpts(overrideArguments=None):
         metavar='POLICY', dest='fixup', default='detect_or_warn',
         help='Automatically correct known faults of the file. '
              'One of never (do nothing), warn (only emit a warning), '
-             'detect_or_warn(the default; fix file if we can, warn otherwise)')
+             'detect_or_warn (the default; fix file if we can, warn otherwise)')
     postproc.add_option(
         '--prefer-avconv',
         action='store_false', dest='prefer_ffmpeg',