Merge branch 'master' of github.com:rg3/youtube-dl

diff --combined youtube_dl/__init__.py
index 42ab572f233e978db634a06d05175a0cf58fc0e7,8f8422cc7689483f33b4658a224e123d80d8472f..92e583744df557b02c76dfa1299c73fdbdd4d53c
--- 1/youtube_dl/__init__.py
--- 2/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@@ -220,7 -220,7 +220,7 @@@ def parseOpts(overrideArguments=None)
                           default=None, type=int)
      selection.add_option('--download-archive', metavar='FILE',
                           dest='download_archive',
 -                         help='Download only videos not present in the archive file. Record all downloaded videos in it.')
 +                         help='Download only videos not present in the archive file. Record the IDs of all downloaded videos in it.')
  
  
      authentication.add_option('-u', '--username',
@@@ -235,7 -235,7 +235,7 @@@
  
      video_format.add_option('-f', '--format',
              action='store', dest='format', metavar='FORMAT', default='best',
-             help='video format code, specifiy the order of preference using slashes: "-f 22/17/18". "-f mp4" and "-f flv" are also supported')
+             help='video format code, specify the order of preference using slashes: "-f 22/17/18". "-f mp4" and "-f flv" are also supported')
      video_format.add_option('--all-formats',
              action='store_const', dest='format', help='download all available video formats', const='all')
      video_format.add_option('--prefer-free-formats',
@@@ -317,7 -317,7 +317,7 @@@
              help='print downloaded pages to debug problems(very verbose)')
      verbosity.add_option('--write-pages',
              action='store_true', dest='write_pages', default=False,
 -            help='Write downloaded pages to files in the current directory')
 +            help='Write downloaded intermediary pages to files in the current directory to debug problems')
      verbosity.add_option('--youtube-print-sig-code',
              action='store_true', dest='youtube_print_sig_code', default=False,
              help=optparse.SUPPRESS_HELP)