Merge tag 'upstream/2013.06.34'

[youtubedl] / README.md

diff --git a/README.md b/README.md
index 2f3c81a7c8848bfb7234fbedd54ecbfa2f0b6063..81b86e264c117954bfddae70f8ba4feb2e16a198 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 % YOUTUBE-DL(1)
 
 # NAME
 % YOUTUBE-DL(1)
 
 # NAME

-youtube-dl
+youtube-dl - download videos from youtube.com or other video platforms

 
 # SYNOPSIS
 **youtube-dl** [OPTIONS] URL [URL...]
 
 # SYNOPSIS
 **youtube-dl** [OPTIONS] URL [URL...]


@@ -116,12 +116,14 @@ which means you can modify it, redistribute it or use it however you like.
     -F, --list-formats         list all available formats (currently youtube
                                only)
     --write-sub                write subtitle file (currently youtube only)
     -F, --list-formats         list all available formats (currently youtube
                                only)
     --write-sub                write subtitle file (currently youtube only)

+    --write-auto-sub           write automatic subtitle file (currently youtube
+                               only)

     --only-sub                 [deprecated] alias of --skip-download
     --all-subs                 downloads all the available subtitles of the
                                video (currently youtube only)
     --list-subs                lists all available subtitles for the video
                                (currently youtube only)
     --only-sub                 [deprecated] alias of --skip-download
     --all-subs                 downloads all the available subtitles of the
                                video (currently youtube only)
     --list-subs                lists all available subtitles for the video
                                (currently youtube only)

-    --sub-format LANG          subtitle format [srt/sbv] (default=srt)
+    --sub-format FORMAT        subtitle format [srt/sbv/vtt] (default=srt)

                                (currently youtube only)
     --sub-lang LANG            language of the subtitles to download (optional)
                                use IETF language tags like 'en'
                                (currently youtube only)
     --sub-lang LANG            language of the subtitles to download (optional)
                                use IETF language tags like 'en'


@@ -130,6 +132,7 @@ which means you can modify it, redistribute it or use it however you like.
     -u, --username USERNAME    account username
     -p, --password PASSWORD    account password
     -n, --netrc                use .netrc authentication data
     -u, --username USERNAME    account username
     -p, --password PASSWORD    account password
     -n, --netrc                use .netrc authentication data

+    --video-password PASSWORD  video password (vimeo only)

 
 ## Post-processing Options:
     -x, --extract-audio        convert video files to audio-only files (requires
 
 ## Post-processing Options:
     -x, --extract-audio        convert video files to audio-only files (requires