Merge tag 'upstream/2014.07.15'

[youtubedl] / README.txt

diff --git a/README.txt b/README.txt
index 4757a338b25780dcca13935d81efb5c1f5fb33b0..5555b2a72b8d6b228e606a862e5e2a13b6698db9 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -82,8 +82,9 @@ OPTIONS
     --default-search PREFIX          Use this prefix for unqualified URLs. For
                                      example "gvsearch2:" downloads two videos
                                      from google videos for  youtube-dl "large
-                                     apple". By default (with value "auto")
-                                     youtube-dl guesses.
+                                     apple". Use the value "auto" to let
+                                     youtube-dl guess. The default value "error"
+                                     just throws an error.
     --ignore-config                  Do not read configuration files. When given
                                      in the global configuration file /etc
                                      /youtube-dl.conf: do not read the user
@@ -282,7 +283,7 @@ Post-processing Options:
                                      128K (default 5)
     --recode-video FORMAT            Encode the video to another format if
                                      necessary (currently supported:
-                                     mp4|flv|ogg|webm)
+                                     mp4|flv|ogg|webm|mkv)
     -k, --keep-video                 keeps the video file on disk after the
                                      post-processing; the video is erased by
                                      default
@@ -678,3 +679,4 @@ youtube-dl is released into the public domain by the copyright holders.
 This README file was originally written by Daniel Bolton
 (https://github.com/dbbolton) and is likewise released into the public
 domain.
+