Merge tag 'upstream/2012.02.27'

[youtubedl] / README.md

diff --git a/README.md b/README.md
index 2b0ab67eba2215b3c4d1f9189d1f2456ee03dad0..5008e5a369727944af31b61376b1927bcff15938 100644 (file)
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ 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)
@@ -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)
+    --max-downloads NUMBER   Abort after downloading NUMBER files
 
 ### 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
-                             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
@@ -63,10 +66,13 @@ 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
+    -v, --verbose            print various debugging information
 
 ### 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
     -F, --list-formats       list all available formats (currently youtube only)
 
@@ -78,7 +84,8 @@ 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
                              ffmpeg and ffprobe)
-    --audio-format FORMAT    "best", "aac", "vorbis" or "mp3"; best by default
+    --audio-format FORMAT    "best", "aac", "vorbis", "mp3", "m4a", or "wav";
+                             best by default
     --audio-quality QUALITY  ffmpeg 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