summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Arko <mail@arko.net>2015-06-19 17:46:11 -0500
committerAndré Arko <mail@arko.net>2015-06-19 17:46:11 -0500
commitb4e21fae5d607752ddffe9db953b913e6f7582bb (patch)
treec0d16c24f1b05356b6986ef1562e70592525eba8
parent535f6cab72e973b26001e1abe54f35c3ee55d228 (diff)
parent8e86d6dd091cd520f31278b1280b21d0950fc429 (diff)
downloadbundler-b4e21fae5d607752ddffe9db953b913e6f7582bb.tar.gz
Merge pull request #3723 from mattbrictson/patch-1
Clarify the purpose of --deployment [ci skip]
-rw-r--r--man/bundle-install.ronn8
1 files changed, 4 insertions, 4 deletions
diff --git a/man/bundle-install.ronn b/man/bundle-install.ronn
index 4cc8fd4b19..4912ccd1b2 100644
--- a/man/bundle-install.ronn
+++ b/man/bundle-install.ronn
@@ -78,8 +78,8 @@ update process below under [CONSERVATIVE UPDATING][].
* `--deployment`:
In [deployment mode][DEPLOYMENT MODE], Bundler will 'roll-out' the bundle for
- `production` use. Please check carefully if you want to have this option
- enabled in `development` or `test` environments.
+ production or CI use. Please check carefully if you want to have this option
+ enabled in your development environment.
* `--force`:
Force download every gem, even if the required versions are already available
@@ -147,8 +147,8 @@ update process below under [CONSERVATIVE UPDATING][].
## DEPLOYMENT MODE
Bundler's defaults are optimized for development. To switch to
-defaults optimized for deployment, use the `--deployment` flag.
-Do not activate deployment mode on development machines, as it
+defaults optimized for deployment and for CI, use the `--deployment`
+flag. Do not activate deployment mode on development machines, as it
will cause an error when the Gemfile(5) is modified.
1. A `Gemfile.lock` is required.