From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Sat, 8 Dec 2012 00:57:43 +0000 (+0100)
Subject: Merge 'rg3/master' into fork_master
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=3c6ffbaedbbae8734f6b86fea1169413b656abf3

Merge 'rg3/master' into fork_master
---

3c6ffbaedbbae8734f6b86fea1169413b656abf3
diff --cc README.md
index b218fc3ec,5789ce2e4..2ca021125
--- a/README.md
+++ b/README.md
@@@ -51,7 -51,7 +51,10 @@@ which means you can modify it, redistri
                               %(upload_date)s for the upload date (YYYYMMDD),
                               %(extractor)s for the provider (youtube, metacafe,
                               etc), %(id)s for the video id and %% for a literal
--                             percent. Use - to output to stdout.
++                             percent. Use - to output to stdout. Can also be
++                             used to download to a different directory, for
++                             example with -o '/my/downloads/%(uploader)s/%(title
++                             )s-%(id)s.%(ext)s' .
      --restrict-filenames     Restrict filenames to only ASCII characters, and
                               avoid "&" and spaces in filenames
      -a, --batch-file FILE    file containing URLs to download ('-' for stdin)