diff options
| author | Andre Arko <andre@arko.net> | 2013-05-22 14:47:41 -0700 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2013-05-22 14:47:41 -0700 |
| commit | 96ce07f596c29733f5414ffc7f8532e0eabea9cb (patch) | |
| tree | 2ab14b92d36e0f06390f04ed3efc6989eedc37c7 /man | |
| parent | 3d7fcaa17b2fffa831c546a10b791784eb152414 (diff) | |
| parent | f7dee43156b3403c5a2b2bfda27fcd2f3486cd44 (diff) | |
| download | bundler-96ce07f596c29733f5414ffc7f8532e0eabea9cb.tar.gz | |
Merge branch '1-3-stable'
Conflicts:
Rakefile
spec/bundler/gem_helper_spec.rb
Diffstat (limited to 'man')
| -rw-r--r-- | man/bundle-install.ronn | 2 | ||||
| -rw-r--r-- | man/bundle.ronn | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/bundle-install.ronn b/man/bundle-install.ronn index 44f36a9805..1bf9066308 100644 --- a/man/bundle-install.ronn +++ b/man/bundle-install.ronn @@ -321,7 +321,7 @@ evaluates the gems currently being used to satisfy its requirements: also used to satisfy a dependency in `activemerchant`, which is not being updated * `rack ~> 1.1.0`: - not currently being used to satify another dependency + not currently being used to satisfy another dependency Because you did not explicitly ask to update `activemerchant`, you would not expect it to suddenly stop working after updating diff --git a/man/bundle.ronn b/man/bundle.ronn index 593441cd7a..c544876f81 100644 --- a/man/bundle.ronn +++ b/man/bundle.ronn @@ -44,7 +44,7 @@ We divide `bundle` subcommands into primary commands and utilities. Specify and read configuration options for bundler * `bundle help(1)`: - Displays this help page + Displays detailed help for each subcommand ## UTILITIES |