Merge v1.0.20.rc from branch '1-0-stable'

Conflicts:
	CHANGELOG.md
	lib/bundler/cli.rb
	lib/bundler/installer.rb
	lib/bundler/version.rb

2 files changed, 5 insertions, 5 deletions

diff --git a/man/bundle-install.ronn b/man/bundle-install.ronn
index bfa7bc19b3..3205c29ec7 100644
--- a/man/bundle-install.ronn
+++ b/man/bundle-install.ronn
@@ -55,9 +55,9 @@ update process below under [CONSERVATIVE UPDATING][].
 
 * `--local`:
   Do not attempt to connect to `rubygems.org`, instead using just
-  the gems located in `vendor/cache`. Note that if a more
-  appropriate platform-specific gem exists on `rubygems.org`,
-  this will bypass the normal lookup.
+  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.
 
 * `--deployment`:
   Switches bundler's defaults into [deployment mode][DEPLOYMENT MODE].
diff --git a/man/gemfile.5.ronn b/man/gemfile.5.ronn
index d97dadc2d1..d6d5886bf7 100644
--- a/man/gemfile.5.ronn
+++ b/man/gemfile.5.ronn
@@ -280,5 +280,5 @@ bundler uses the following priority order:
      repository otherwise declared. This results in bundler prioritizing the
      ActiveSupport gem from the Rails git repository over ones from
      `rubygems.org`
-  3. The sources specified via `source`, in the order in which they were
-     declared in the `Gemfile`.
+  3. The sources specified via `source`, searching each source in your `Gemfile`
+     from last added to first added.