Merge branch 'master' of github.com:ntoniazzi/composer

Conflicts:
	doc/04-schema.md
	src/Composer/Factory.php

doc/04-schema.md

@@ -754,6 +754,16 @@ The following options are supported:
   `{"github.com": "oauthtoken"}` as the value of this option will use `oauthtoken`
   to access private repositories on github and to circumvent the low IP-based
   rate limiting of their API.
+  [Read more](articles/troubleshooting.md#api-rate-limit-and-oauth-tokens)
+  on how to get an OAuth token for GitHub.
+* **http-basic:** A list of domain names and username/passwords to authenticate
+  against them. For example using
+  `{"example.org": {"username": "alice", "password": "foo"}` as the value of this option will let composer authenticate against example.org.
+* **vendor-dir:** Defaults to `vendor`. You can install dependencies into a
+  different directory if you want to. `$HOME` and `~` will be replaced by your
+  home directory's path in vendor-dir and all `*-dir` options below.
+* **bin-dir:** Defaults to `vendor/bin`. If a project includes binaries, they
+  will be symlinked into this directory.
 * **cache-dir:** Defaults to `C:\Users\<user>\AppData\Local\Composer` on Windows,
   `$XDG_CACHE_HOME/composer` on unix systems that follow the XDG Base Directory
   Specifications, and `$home/cache` on other unix systems. Stores all the caches

src/Composer/Factory.php

@@ -94,8 +94,6 @@ class Factory
                     $xdgCache = $home . '/.cache';
                 }
                 $cacheDir = $xdgCache . '/composer';
-
-
             } else {
                 $cacheDir = $home . '/cache';
             }