X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=README.md;h=4adcb1f4493bff719237d4b07e8d01d85f96a8e5;hb=895ec266bbcd40ecbc755e4efd130be380809d8a;hp=790540bc872dff937ba0071de588e5c08fe23977;hpb=6a1ca41e17f703931308e197638800f7f0c29411;p=youtube-dl.git

diff --git a/README.md b/README.md
index 790540b..4adcb1f 100644
--- a/README.md
+++ b/README.md
@@ -28,16 +28,25 @@ 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
     -l, --literal            use literal title in file name
     -A, --auto-number        number downloaded files starting from 00000
-    -o, --output TEMPLATE    output filename template
+    -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,
+                             %(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
-    --cookies FILE           file to dump cookie jar to
+    --no-continue            do not resume partially downloaded files (restart
+                             from beginning)
+    --cookies FILE           file to read cookies from and dump cookie jar in
     --no-part                do not use .part files
     --no-mtime               do not use the Last-modified header to set the file
                              modification time
@@ -61,7 +70,10 @@ which means you can modify it, redistribute it or use it however you like.
 ### 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)
 
 ### Authentication Options:
     -u, --username USERNAME  account username
@@ -71,7 +83,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" 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