new .travis.yml with notifications and 3.3

[youtube-dl] / README.md

diff --git a/README.md b/README.md
index f251788ce10f97638d32f86b74fcf28f59cb8bb3..b218fc3eca20217871ca7d202b044278a4f7c385 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-% youtube-dl(1)
+% YOUTUBE-DL(1)

 
 # NAME
 youtube-dl
 
 # NAME
 youtube-dl


@@ -20,6 +20,11 @@ which means you can modify it, redistribute it or use it however you like.
     -i, --ignore-errors      continue on download errors
     -r, --rate-limit LIMIT   download rate limit (e.g. 50k or 44.6m)
     -R, --retries RETRIES    number of retries (default is 10)
     -i, --ignore-errors      continue on download errors
     -r, --rate-limit LIMIT   download rate limit (e.g. 50k or 44.6m)
     -R, --retries RETRIES    number of retries (default is 10)

+    --buffer-size SIZE       size of download buffer (e.g. 1024 or 16k) (default
+                             is 1024)
+    --no-resize-buffer       do not automatically adjust the buffer size. By
+                             default, the buffer size is automatically resized
+                             from an initial value of SIZE.

     --dump-user-agent        display the current browser identification
     --user-agent UA          specify a custom user agent
     --list-extractors        List all supported extractors and the URLs they
     --dump-user-agent        display the current browser identification
     --user-agent UA          specify a custom user agent
     --list-extractors        List all supported extractors and the URLs they


@@ -117,9 +122,9 @@ The `-o` option allows users to indicate a template for the output file names. T
  - `uploader`: The sequence will be replaced by the nickname of the person who uploaded the video.
  - `upload_date`: The sequence will be replaced by the upload date in YYYYMMDD format.
  - `title`: The sequence will be replaced by the video title.
  - `uploader`: The sequence will be replaced by the nickname of the person who uploaded the video.
  - `upload_date`: The sequence will be replaced by the upload date in YYYYMMDD format.
  - `title`: The sequence will be replaced by the video title.

-ext`: The sequence will be replaced by the appropriate extension (like flv or mp4).
-epoch`: The sequence will be replaced by the Unix epoch when creating the file.
-autonumber`: The sequence will be replaced by a five-digit number that will be increased with each download, starting at zero.
+ - `ext`: The sequence will be replaced by the appropriate extension (like flv or mp4).
+ - `epoch`: The sequence will be replaced by the Unix epoch when creating the file.
+ - `autonumber`: The sequence will be replaced by a five-digit number that will be increased with each download, starting at zero.

 
 The current default template is `%(id)s.%(ext)s`, but that will be switchted to `%(title)s-%(id)s.%(ext)s` (which can be requested with `-t` at the moment).
 
 
 The current default template is `%(id)s.%(ext)s`, but that will be switchted to `%(title)s-%(id)s.%(ext)s` (which can be requested with `-t` at the moment).
 


@@ -165,14 +170,6 @@ The error
 
 means you're using an outdated version of Python. Please update to Python 2.6 or 2.7.
 
 
 means you're using an outdated version of Python. Please update to Python 2.6 or 2.7.
 

-To run youtube-dl under Python 2.5, you'll have to manually check it out like this:
-
-       git clone git://github.com/rg3/youtube-dl.git
-       cd youtube-dl
-       python -m youtube_dl --help
-
-Please note that Python 2.5 is not supported anymore.
-

 ### What is this binary file? Where has the code gone?
 
 Since June 2012 (#342) youtube-dl is packed as an executable zipfile, simply unzip it (might need renaming to `youtube-dl.zip` first on some systems) or clone the git repository, as laid out above. If you modify the code, you can run it by executing the `__main__.py` file. To recompile the executable, run `make youtube-dl`.
 ### What is this binary file? Where has the code gone?
 
 Since June 2012 (#342) youtube-dl is packed as an executable zipfile, simply unzip it (might need renaming to `youtube-dl.zip` first on some systems) or clone the git repository, as laid out above. If you modify the code, you can run it by executing the `__main__.py` file. To recompile the executable, run `make youtube-dl`.