Merge remote-tracking branch 'michael-k/links'

diff --combined README.md
index cae61a855c079c67f9b2815c1b7024c7805d5afc,9784e9c2a23bfe3409a817b6e8f170ea1594d5f4..c284db4955130065504aabe046ac4c0526917ba4
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -131,19 -131,17 +131,19 @@@ 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, %(playlist)s for the playlist the
 +                                     video id, %(playlist_title)s,
 +                                     %(playlist_id)s, or %(playlist)s (=title if
 +                                     present, ID otherwise) for the playlist the
                                       video is in, %(playlist_index)s for the
 -                                     position in the playlist and %% for a
 -                                     literal percent. %(height)s and %(width)s
 -                                     for the width and height of the video
 -                                     format. %(resolution)s for a textual
 +                                     position in the playlist. %(height)s and
 +                                     %(width)s for the width and height of the
 +                                     video format. %(resolution)s for a textual
                                       description of the resolution of the video
 -                                     format. Use - to output to stdout. Can also
 -                                     be used to download to a different
 -                                     directory, for example with -o '/my/downloa
 -                                     ds/%(uploader)s/%(title)s-%(id)s.%(ext)s' .
 +                                     format. %% for a literal 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' .
      --autonumber-size NUMBER         Specifies the number of digits in
                                       %(autonumber)s when it is present in output
                                       filename template or --auto-number option
@@@ -241,13 -239,8 +241,13 @@@
                                       "worst", "worstvideo" and "worstaudio". By
                                       default, youtube-dl will pick the best
                                       quality. Use commas to download multiple
 -                                     audio formats, such as  -f
 -                                     136/137/mp4/bestvideo,140/m4a/bestaudio
 +                                     audio formats, such as -f
 +                                     136/137/mp4/bestvideo,140/m4a/bestaudio.
 +                                     You can merge the video and audio of two
 +                                     formats into a single file using -f <video-
 +                                     format>+<audio-format> (requires ffmpeg or
 +                                     avconv), for example -f
 +                                     bestvideo+bestaudio.
      --all-formats                    download all available video formats
      --prefer-free-formats            prefer free video formats unless a specific
                                       one is requested
@@@ -507,7 -500,7 +507,7 @@@ If you want to add support for a new si
  6. Run `python test/test_download.py TestDownload.test_YourExtractor`. This *should fail* at first, but you can continually re-run it until you're done. If you decide to add more than one test, then rename ``_TEST`` to ``_TESTS`` and make it into a list of dictionaries. The tests will be then be named `TestDownload.test_YourExtractor`, `TestDownload.test_YourExtractor_1`, `TestDownload.test_YourExtractor_2`, etc.
  7. Have a look at [`youtube_dl/common/extractor/common.py`](https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should return](https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/common.py#L38). Add tests and code for as many as you want.
  8. If you can, check the code with [pyflakes](https://pypi.python.org/pypi/pyflakes) (a good idea) and [pep8](https://pypi.python.org/pypi/pep8) (optional, ignore E501).
- 9. When the tests pass, [add](https://www.kernel.org/pub/software/scm/git/docs/git-add.html) the new files and [commit](https://www.kernel.org/pub/software/scm/git/docs/git-commit.html) them and [push](https://www.kernel.org/pub/software/scm/git/docs/git-push.html) the result, like this:
+ 9. When the tests pass, [add](http://git-scm.com/docs/git-add) the new files and [commit](http://git-scm.com/docs/git-commit) them and [push](http://git-scm.com/docs/git-push) the result, like this:
  
          $ git add youtube_dl/extractor/__init__.py
          $ git add youtube_dl/extractor/yourextractor.py