diff options
| author | Andre Arko <andre@arko.net> | 2014-01-10 18:18:55 -0800 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2014-01-10 23:05:03 -0800 |
| commit | ec9165fdffe63f6d5a8b2a9a302252ec1116618c (patch) | |
| tree | 832691ee4d654f00b183893de5b9d6af8435d00e /man/bundle-install.ronn | |
| parent | 27205e903455e38a79a765c0426f63e3ae8efd0e (diff) | |
| download | bundler-ec9165fdffe63f6d5a8b2a9a302252ec1116618c.tar.gz | |
Merge tag 'v1.5.2' into 'master'
Conflicts:
CHANGELOG.md
Rakefile
lib/bundler/installer.rb
lib/bundler/rubygems_ext.rb
lib/bundler/source/rubygems.rb
spec/realworld/parallel_install_spec.rb
spec/realworld/parallel_update_spec.rb
Diffstat (limited to 'man/bundle-install.ronn')
| -rw-r--r-- | man/bundle-install.ronn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/man/bundle-install.ronn b/man/bundle-install.ronn index 2af9c45d3a..92a1923e60 100644 --- a/man/bundle-install.ronn +++ b/man/bundle-install.ronn @@ -61,7 +61,7 @@ update process below under [CONSERVATIVE UPDATING][]. Do not attempt to connect to `rubygems.org`, instead using just the gems already present in Rubygems' cache or in `vendor/cache`. Note that if a more appropriate platform-specific gem exists on - `rubygems.org`, it will not be found. This option implies `--no-cache`. + `rubygems.org`, it will not be found. * `--deployment`: Switches bundler's defaults into [deployment mode][DEPLOYMENT MODE]. |