[rubygems/rubygems] Rename local to lockfile and global to system

https://github.com/rubygems/rubygems/commit/456fd05d3a

4 files changed, 7 insertions, 7 deletions

diff --git a/lib/bundler/man/bundle-config.1 b/lib/bundler/man/bundle-config.1
index 760d7c2df3..c442172452 100644
--- a/lib/bundler/man/bundle-config.1
+++ b/lib/bundler/man/bundle-config.1
@@ -296,7 +296,7 @@ The following is a list of all configuration keys and their purpose\. You can le
 \fBuser_agent\fR (\fBBUNDLE_USER_AGENT\fR): The custom user agent fragment Bundler includes in API requests\.
 .
 .IP "\(bu" 4
-\fBversion\fR (\fBBUNDLE_VERSION\fR): The version of Bundler to use when running under Bundler environment\. Defaults to \fBlocal\fR\. You can also specify \fBglobal\fR or \fBx\.y\.z\fR\. \fBlocal\fR will use the Bundler version specified in the \fBGemfile\.lock\fR, \fBglobal\fR will use the system version of Bundler, and \fBx\.y\.z\fR will use the specified version of Bundler\.
+\fBversion\fR (\fBBUNDLE_VERSION\fR): The version of Bundler to use when running under Bundler environment\. Defaults to \fBlocal\fR\. You can also specify \fBsystem\fR or \fBx\.y\.z\fR\. \fBlockfile\fR will use the Bundler version specified in the \fBGemfile\.lock\fR, \fBsystem\fR will use the system version of Bundler, and \fBx\.y\.z\fR will use the specified version of Bundler\.
 .
 .IP "\(bu" 4
 \fBwith\fR (\fBBUNDLE_WITH\fR): A \fB:\fR\-separated list of groups whose gems bundler should install\.
diff --git a/lib/bundler/man/bundle-config.1.ronn b/lib/bundler/man/bundle-config.1.ronn
index 438a84cd1c..3e2e01dd82 100644
--- a/lib/bundler/man/bundle-config.1.ronn
+++ b/lib/bundler/man/bundle-config.1.ronn
@@ -276,9 +276,9 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
    The custom user agent fragment Bundler includes in API requests.
 * `version` (`BUNDLE_VERSION`):
    The version of Bundler to use when running under Bundler environment.
-   Defaults to `local`. You can also specify `global` or `x.y.z`.
-   `local` will use the Bundler version specified in the `Gemfile.lock`,
-   `global` will use the system version of Bundler, and `x.y.z` will use
+   Defaults to `local`. You can also specify `system` or `x.y.z`.
+   `lockfile` will use the Bundler version specified in the `Gemfile.lock`,
+   `system` will use the system version of Bundler, and `x.y.z` will use
    the specified version of Bundler.
 * `with` (`BUNDLE_WITH`):
    A `:`-separated list of groups whose gems bundler should install.
diff --git a/lib/bundler/self_manager.rb b/lib/bundler/self_manager.rb
index 491800514d..5d7546e926 100644
--- a/lib/bundler/self_manager.rb
+++ b/lib/bundler/self_manager.rb
@@ -86,7 +86,7 @@ module Bundler
         released?(lockfile_version) &&
         !running?(lockfile_version) &&
         !updating? &&
-        Bundler.settings[:version] != "global"
+        Bundler.settings[:version] != "system"
     end
 
     def autoswitching_applies?
@@ -177,7 +177,7 @@ module Bundler
       # BUNDLE_VERSION=x.y.z
       @restart_version = Gem::Version.new(Bundler.settings[:version])
     rescue ArgumentError
-      # BUNDLE_VERSION=local
+      # BUNDLE_VERSION=lockfile
       @restart_version = lockfile_version
     end
   end
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index 5b5c882cb2..3ba378b9c0 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -84,7 +84,7 @@ module Bundler
       "BUNDLE_REDIRECT" => 5,
       "BUNDLE_RETRY" => 3,
       "BUNDLE_TIMEOUT" => 10,
-      "BUNDLE_VERSION" => "local",
+      "BUNDLE_VERSION" => "lockfile",
     }.freeze
 
     def initialize(root = nil)