瀏覽代碼

Merge pull request #401 from igorw/proxy-docs

Proxy docs
Jordi Boggiano 13 年之前
父節點
當前提交
8198292619
共有 3 個文件被更改,包括 9 次插入3 次删除
  1. 1 1
      doc/02-libraries.md
  2. 7 1
      doc/03-cli.md
  3. 1 1
      doc/04-schema.md

+ 1 - 1
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
 

+ 7 - 1
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.

+ 1 - 1
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: