From 364afaa16a32126ce5956c56154e3cc7083aa57b Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Tue, 6 Mar 2012 23:54:07 +0100 Subject: [PATCH 1/2] [docs] fix some links to the repositories page --- doc/02-libraries.md | 2 +- doc/04-schema.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/02-libraries.md b/doc/02-libraries.md index d535a78b6..1fdb54782 100644 --- a/doc/02-libraries.md +++ b/doc/02-libraries.md @@ -74,7 +74,7 @@ Here are some examples of version branch names: 1.1.* > **Note:** When you install a dev version, it will install it from source. -See [Repositories] for more information. +See [Repositories](05-repositories) for more information. ## Lock file diff --git a/doc/04-schema.md b/doc/04-schema.md index 0572da36f..cd0c86a96 100644 --- a/doc/04-schema.md +++ b/doc/04-schema.md @@ -247,7 +247,7 @@ The following repository types are supported: composer whatsoever you can define the package inline using a `package` repository. You basically just inline the `composer.json` object. -For more information on any of these, see [Repositories]. +For more information on any of these, see [Repositories](05-repositories). Example: From 29871573d00b90e2db12f67c170f3a5074f6d414 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Wed, 7 Mar 2012 00:03:35 +0100 Subject: [PATCH 2/2] [docs] add docs for HTTP_PROXY env var to the cli page, refs #394 --- doc/03-cli.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/03-cli.md b/doc/03-cli.md index 7cfb28068..4d6de32b4 100644 --- a/doc/03-cli.md +++ b/doc/03-cli.md @@ -166,7 +166,7 @@ For example: ### COMPOSER_VENDOR_DIR -By setting this option you can make composer install the dependencies into a +By setting this var you can make composer install the dependencies into a directory other than `vendor`. ### COMPOSER_BIN_DIR @@ -178,3 +178,9 @@ directory to something other than `vendor/bin`. This env var controls the time composer waits for commands (such as git commands) to finish executing. The default value is 60 seconds. + +### HTTP_PROXY + +If you are using composer from behind an HTTP proxy, you can use the standard +`HTTP_PROXY` or `http_proxy` env vars. Simply set it to the URL of your proxy. +Many operating systems already set this variable for you.