aboutsummaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-04-13 21:23:01 -0700
committerAndre Arko <andre@arko.net>2015-04-13 22:50:16 -0700
commite41edd133a737ed95581a4e850076c7160289269 (patch)
tree896f72d91172eea039efd8052dc1362ee5a05402 /man
parent3c3d5c635c23abd43c1e2f1b72d55f6d38956119 (diff)
downloadbundler-e41edd133a737ed95581a4e850076c7160289269.tar.gz
Merge tag 'v1.9.4'
Version 1.9.4 Conflicts: lib/bundler/installer.rb lib/bundler/match_platform.rb lib/bundler/source/rubygems.rb
Diffstat (limited to 'man')
-rw-r--r--man/bundle-config.ronn8
-rw-r--r--man/bundle-install.ronn6
2 files changed, 11 insertions, 3 deletions
diff --git a/man/bundle-config.ronn b/man/bundle-config.ronn
index 1a47fc15..c0657c5e 100644
--- a/man/bundle-config.ronn
+++ b/man/bundle-config.ronn
@@ -106,9 +106,15 @@ learn more about their operation in [bundle install(1)][bundle-install].
* `ssl_client_cert` (`BUNDLE_SSL_CLIENT_CERT`):
Path to a designated file containing a X.509 client certificate
and key in PEM format.
+* `cache_path` (`BUNDLE_CACHE_PATH`): The directory that bundler will place
+ cached gems in when running <code>bundle package</code>, and that bundler
+ will look in when installing gems.
+* `disable_multisource` (`BUNDLE_DISABLE_MULTISOURCE`): When set, Gemfiles
+ containing multiple sources will produce errors instead of warnings. Use
+ `bundle config --delete disable_multisource` to unset.
In general, you should set these settings per-application by using the applicable
-flag to the [bundle install(1)][bundle-install] command.
+flag to the [bundle install(1)][bundle-install] or [bundle package(1)][bundle-package] command.
You can set them globally either via environment variables or `bundle config`,
whichever is preferable for your setup. If you use both, environment variables
diff --git a/man/bundle-install.ronn b/man/bundle-install.ronn
index 117fd363..381b714b 100644
--- a/man/bundle-install.ronn
+++ b/man/bundle-install.ronn
@@ -8,10 +8,12 @@ bundle-install(1) -- Install the dependencies specified in your Gemfile
[--full-index]
[--gemfile=GEMFILE]
[--jobs=NUMBER]
- [--local] [--deployment]
+ [--local]
+ [--deployment]
[--no-cache]
[--no-prune]
- [--path PATH] [--system]
+ [--path PATH]
+ [--system]
[--quiet]
[--retry=NUMBER]
[--shebang]