Prepare for upload.

[youtubedl] / README.md

diff --git a/README.md b/README.md
index ad0590f9983ba5890c28dd1d64881319e7b7ff11..f04b96128de7effb5e2d19f06642398403425bcd 100644 (file)
--- a/README.md
+++ b/README.md
@@ -6,13 +6,13 @@ youtube-dl [options] url [url...]
 ## DESCRIPTION
 **youtube-dl** is a small command-line program to download videos from
 YouTube.com and a few more sites. It requires the Python interpreter, version
 ## DESCRIPTION
 **youtube-dl** is a small command-line program to download videos from
 YouTube.com and a few more sites. It requires the Python interpreter, version

-2.x (x being at least 5), and it is not platform specific. It should work in
+2.x (x being at least 6), and it is not platform specific. It should work in

 your Unix box, in Windows or in Mac OS X. It is released to the public domain,
 which means you can modify it, redistribute it or use it however you like.
 
 ## OPTIONS
     -h, --help               print this help text and exit
 your Unix box, in Windows or in Mac OS X. It is released to the public domain,
 which means you can modify it, redistribute it or use it however you like.
 
 ## OPTIONS
     -h, --help               print this help text and exit

-    -v, --version            print program version and exit
+    --version                print program version and exit

     -U, --update             update this program to latest version
     -i, --ignore-errors      continue on download errors
     -r, --rate-limit LIMIT   download rate limit (e.g. 50k or 44.6m)
     -U, --update             update this program to latest version
     -i, --ignore-errors      continue on download errors
     -r, --rate-limit LIMIT   download rate limit (e.g. 50k or 44.6m)


@@ -28,6 +28,7 @@ which means you can modify it, redistribute it or use it however you like.
                              sub-string)
     --reject-title REGEX     skip download for matching titles (regex or
                              caseless sub-string)
                              sub-string)
     --reject-title REGEX     skip download for matching titles (regex or
                              caseless sub-string)

+    --max-downloads NUMBER   Abort after downloading NUMBER files

 
 ### Filesystem Options:
     -t, --title              use title in file name
 
 ### Filesystem Options:
     -t, --title              use title in file name


@@ -36,8 +37,10 @@ which means you can modify it, redistribute it or use it however you like.
     -o, --output TEMPLATE    output filename template. Use %(stitle)s to get the
                              title, %(uploader)s for the uploader name,
                              %(autonumber)s to get an automatically incremented
     -o, --output TEMPLATE    output filename template. Use %(stitle)s to get the
                              title, %(uploader)s for the uploader name,
                              %(autonumber)s to get an automatically incremented

-                             number, %(ext)s for the filename extension, and %%
-                             for a literal percent
+                             number, %(ext)s for the filename extension,
+                             %(upload_date)s for the upload date (YYYYMMDD), and
+                             %% for a literal percent. Use - to output to
+                             stdout.

     -a, --batch-file FILE    file containing URLs to download ('-' for stdin)
     -w, --no-overwrites      do not overwrite files
     -c, --continue           resume partially downloaded files
     -a, --batch-file FILE    file containing URLs to download ('-' for stdin)
     -w, --no-overwrites      do not overwrite files
     -c, --continue           resume partially downloaded files


@@ -63,11 +66,19 @@ which means you can modify it, redistribute it or use it however you like.
     --get-format             simulate, quiet but print output format
     --no-progress            do not print progress bar
     --console-title          display progress in console titlebar
     --get-format             simulate, quiet but print output format
     --no-progress            do not print progress bar
     --console-title          display progress in console titlebar

+    -v, --verbose            print various debugging information

 
 ### Video Format Options:
     -f, --format FORMAT      video format code
     --all-formats            download all available video formats
 
 ### Video Format Options:
     -f, --format FORMAT      video format code
     --all-formats            download all available video formats

+    --prefer-free-formats    prefer free video formats unless a specific one is
+                             requested

     --max-quality FORMAT     highest quality format to download
     --max-quality FORMAT     highest quality format to download

+    -F, --list-formats       list all available formats (currently youtube only)
+    --write-srt              write video closed captions to a .srt file
+                             (currently youtube only)
+    --srt-lang LANG          language of the closed captions to download
+                             (optional) use IETF language tags like 'en'

 
 ### Authentication Options:
     -u, --username USERNAME  account username
 
 ### Authentication Options:
     -u, --username USERNAME  account username


@@ -76,9 +87,11 @@ which means you can modify it, redistribute it or use it however you like.
 
 ### Post-processing Options:
     --extract-audio          convert video files to audio-only files (requires
 
 ### Post-processing Options:
     --extract-audio          convert video files to audio-only files (requires

-                             ffmpeg and ffprobe)
-    --audio-format FORMAT    "best", "aac", "vorbis" or "mp3"; best by default
-    --audio-quality QUALITY  ffmpeg audio bitrate specification, 128k by default
+                             ffmpeg or avconv and ffprobe or avprobe)
+    --audio-format FORMAT    "best", "aac", "vorbis", "mp3", "m4a", or "wav";
+                             best by default
+    --audio-quality QUALITY  ffmpeg/avconv audio bitrate specification, 128k by
+                             default

     -k, --keep-video         keeps the video file on disk after the post-
                              processing; the video is erased by default
 
     -k, --keep-video         keeps the video file on disk after the post-
                              processing; the video is erased by default
 


@@ -98,7 +111,7 @@ Once the video is fully downloaded, use any video player, such as [vlc](http://w
 
 ### The links provided by youtube-dl -g are not working anymore
 
 
 ### The links provided by youtube-dl -g are not working anymore
 

-The URLs youtube-dl outputs require the downloader to have the correct cookies. Use the `--cookies` option to write the required cookies into a file, and advise your downloader to read cookies from that file.
+The URLs youtube-dl outputs require the downloader to have the correct cookies. Use the `--cookies` option to write the required cookies into a file, and advise your downloader to read cookies from that file. Some sites also require a common user agent to be used, use `--dump-user-agent` to see the one in use by youtube-dl.

 
 ### ERROR: no fmt_url_map or conn information found in video info
 
 
 ### ERROR: no fmt_url_map or conn information found in video info