summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-07-12 15:14:03 -0500
committerSamuel Giddins <segiddins@segiddins.me>2017-07-12 15:14:03 -0500
commitf1c7d4e342ca73f69d3aeb3720e094b80a7a154c (patch)
treeafd8adb596fa84f6598b1847ad19fd788be9d1ec
parentb5f9e10b53a829e3471492bae7b87c43d60de4f4 (diff)
downloadbundler-seg-deployment-means-frozen.tar.gz
Update the docs to make frozen/deployment clearerseg-deployment-means-frozen
-rw-r--r--man/bundle-config.ronn8
1 files changed, 5 insertions, 3 deletions
diff --git a/man/bundle-config.ronn b/man/bundle-config.ronn
index c1e9f8e997..42fb69465a 100644
--- a/man/bundle-config.ronn
+++ b/man/bundle-config.ronn
@@ -139,7 +139,8 @@ learn more about their operation in [bundle install(1)][bundle-install].
* `console` (`BUNDLE_CONSOLE`):
The console that `bundle console` starts. Defaults to `irb`.
* `deployment` (`BUNDLE_DEPLOYMENT`):
- Disallow changes to the `Gemfile`.
+ Disallow changes to the `Gemfile`. When the `Gemfile` is changed and the
+ lockfile has not been updated, running Bundler commands will be blocked.
* `disable_checksum_validation` (`BUNDLE_DISABLE_CHECKSUM_VALIDATION`):
Allow installing gems even if they do not match the checksum provided by
RubyGems.
@@ -164,8 +165,9 @@ learn more about their operation in [bundle install(1)][bundle-install].
Ignore the current machine's platform and install only `ruby` platform gems.
As a result, gems with native extensions will be compiled from source.
* `frozen` (`BUNDLE_FROZEN`):
- Disallow changes to the `Gemfile`. Defaults to `true` when `--deployment`
- is used.
+ Disallow changes to the `Gemfile`. When the `Gemfile` is changed and the
+ lockfile has not been updated, running Bundler commands will be blocked.
+ Defaults to `true` when `--deployment` is used.
* `gem.push_key` (`BUNDLE_GEM__PUSH_KEY`):
Sets the `--key` parameter for `gem push` when using the `rake release`
command with a private gemstash server.