X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Foptions.py;h=4144454e578797437549766f38abfffc042bf645;hb=3540fe262f6131b220d3af7ee8017e8407e44319;hp=46c326b3d73da7c2ec44fceeb10cf885d8e47fbb;hpb=797c636bcb02d1199015b753d26430eec13c4b2b;p=youtube-dl

diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 46c326b3d..4144454e5 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -341,7 +341,7 @@ def parseOpts(overrideArguments=None):
     authentication.add_option(
         '-2', '--twofactor',
         dest='twofactor', metavar='TWOFACTOR',
-        help='Two-factor auth code')
+        help='Two-factor authentication code')
     authentication.add_option(
         '-n', '--netrc',
         action='store_true', dest='usenetrc', default=False,
@@ -355,19 +355,19 @@ def parseOpts(overrideArguments=None):
     adobe_pass.add_option(
         '--ap-mso',
         dest='ap_mso', metavar='MSO',
-        help='Adobe Pass Multiple-system operator Identifier')
+        help='Adobe Pass multiple-system operator (TV provider) identifier, use --ap-list-mso for a list of available MSOs')
     adobe_pass.add_option(
         '--ap-username',
         dest='ap_username', metavar='USERNAME',
-        help='TV Provider Login with this account ID')
+        help='Multiple-system operator account login')
     adobe_pass.add_option(
         '--ap-password',
         dest='ap_password', metavar='PASSWORD',
-        help='TV Provider Account password. If this option is left out, youtube-dl will ask interactively.')
+        help='Multiple-system operator account password. If this option is left out, youtube-dl will ask interactively.')
     adobe_pass.add_option(
-        '--ap-mso-list',
-        action='store_true', dest='ap_mso_list', default=False,
-        help='List all supported TV Providers')
+        '--ap-list-mso',
+        action='store_true', dest='ap_list_mso', default=False,
+        help='List all supported multiple-system operators')
 
     video_format = optparse.OptionGroup(parser, 'Video Format Options')
     video_format.add_option(
@@ -469,7 +469,7 @@ def parseOpts(overrideArguments=None):
     downloader.add_option(
         '--xattr-set-filesize',
         dest='xattr_set_filesize', action='store_true',
-        help='Set file xattribute ytdl.filesize with expected filesize (experimental)')
+        help='Set file xattribute ytdl.filesize with expected file size (experimental)')
     downloader.add_option(
         '--hls-prefer-native',
         dest='hls_prefer_native', action='store_true', default=None,
@@ -831,6 +831,7 @@ def parseOpts(overrideArguments=None):
     parser.add_option_group(video_format)
     parser.add_option_group(subtitles)
     parser.add_option_group(authentication)
+    parser.add_option_group(adobe_pass)
     parser.add_option_group(postproc)
 
     if overrideArguments is not None: