[README.md] Fix spelling and harmonize line length

[youtube-dl] / youtube_dl / options.py

diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 342ae3be39d7c8a51aea6c8ab4d924635f11fe00..4144454e578797437549766f38abfffc042bf645 100644 (file)
--- 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,
@@ -353,21 +353,21 @@ def parseOpts(overrideArguments=None):
 
     adobe_pass = optparse.OptionGroup(parser, 'Adobe Pass Options')
     adobe_pass.add_option(
-        '--ap-mso-id',
-        dest='ap_mso_id', metavar='APMSOID',
-        help='Adobe Pass Multiple-system operator Identifier')
+        '--ap-mso',
+        dest='ap_mso', metavar='MSO',
+        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='APUSERNAME',
-        help='TV Provider Login with this account ID')
+        dest='ap_username', metavar='USERNAME',
+        help='Multiple-system operator account login')
     adobe_pass.add_option(
         '--ap-password',
-        dest='ap_password', metavar='APPASSWORD',
-        help='TV Provider Account password. If this option is left out, youtube-dl will ask interactively.')
+        dest='ap_password', metavar='PASSWORD',
+        help='Multiple-system operator account password. If this option is left out, youtube-dl will ask interactively.')
     adobe_pass.add_option(
-        '--list-ap-mso-ids',
-        action='store_true', dest='list_ap_mso_ids', 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: