From fed953c09d8ce02cf34a0a9fac935bc37536a9c4 Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@gmail.com>
Date: Sun, 30 Aug 2020 16:00:53 +0200
Subject: [PATCH] Fix deprecation messages for `bundle install` flags, the
 config should be --local as before

* See https://github.com/rubygems/rubygems/issues/3916
* Always show --local or --global for `bundle config set` commands as
  the default is global which can be not intuitive (#3916).
---
 bundler/CHANGELOG.md                          |   1 +
 bundler/UPGRADING.md                          |   4 +-
 bundler/lib/bundler.rb                        |   2 +-
 bundler/lib/bundler/cli.rb                    |  14 +-
 bundler/lib/bundler/dsl.rb                    |   2 +-
 bundler/lib/bundler/fetcher.rb                |   2 +-
 bundler/lib/bundler/lazy_specification.rb     |   2 +-
 bundler/lib/bundler/rubygems_gem_installer.rb |   2 +-
 bundler/lib/bundler/source_list.rb            |   2 +-
 bundler/man/bundle-config.1                   |  24 +-
 bundler/man/bundle-config.1.txt               | 285 +++++++++---------
 bundler/man/bundle-config.ronn                |  24 +-
 bundler/man/gemfile.5                         |   4 +-
 bundler/man/gemfile.5.ronn                    |   4 +-
 bundler/man/gemfile.5.txt                     |   4 +-
 bundler/spec/bundler/source_list_spec.rb      |   2 +-
 bundler/spec/commands/outdated_spec.rb        |   4 +-
 bundler/spec/install/gemfile/platform_spec.rb |   2 +-
 .../spec/install/gems/compact_index_spec.rb   |   4 +-
 .../spec/install/gems/dependency_api_spec.rb  |   2 +-
 bundler/spec/other/major_deprecation_spec.rb  |   8 +-
 21 files changed, 200 insertions(+), 198 deletions(-)

diff --git a/bundler/CHANGELOG.md b/bundler/CHANGELOG.md
index b063905806b4..7b58e968d665 100644
--- a/bundler/CHANGELOG.md
+++ b/bundler/CHANGELOG.md
@@ -12,6 +12,7 @@
   - Avoid autoloading `openssl` to try help with jruby load service issues [#3809](https://github.com/rubygems/rubygems/pull/3809)
   - Fix `rake release` pushing all local tags instead of only the release tag [#3785](https://github.com/rubygems/rubygems/pull/3785)
   - Fix `rake release` aborting when credentials file is missing, even if properly configured through XDG [#3783](https://github.com/rubygems/rubygems/pull/3783)
+  - Fix deprecation warnings for `bundle install` flags to use `bundle config set --local KEY VALUE` [#3917](https://github.com/rubygems/rubygems/pull/3917)
 
 # 2.2.0.rc.1 (July 2, 2020)
 
diff --git a/bundler/UPGRADING.md b/bundler/UPGRADING.md
index 16ee8d3e759e..efee3704ad23 100644
--- a/bundler/UPGRADING.md
+++ b/bundler/UPGRADING.md
@@ -9,7 +9,7 @@ look like. All these deprecations are printed by default in the Bundler 2.1 rele
 If you don't want to deal with deprecations right now and want to toggle them
 off, you can do it through configuration. Set the `BUNDLE_SILENCE_DEPRECATIONS`
 environment variable to "true", or configure it through `bundle config` either
-globally through `bundle config set silence_deprecations true` command, or
+globally through `bundle config set --global silence_deprecations true` command, or
 locally through `bundle config set --local silence_deprecations true`. From now
 on in this document we will assume that all three of these configuration options
 are available, but will only mention `bundle config set <option> <value>`.
@@ -51,7 +51,7 @@ in the upcoming 3 version.
   development and test gems.  This magic will disappear from bundler 3, and
   you will explicitly need to configure it, either through environment
   variables, application configuration, or machine configuration. For example,
-  with `bundle config set without development test`.
+  with `bundle config set --local without development test`.
 
   The removal of this kind of flag also applies to analogous commands, for
   example, to `bundle check --path`.
diff --git a/bundler/lib/bundler.rb b/bundler/lib/bundler.rb
index b82caeeeb30c..2654a6da8256 100644
--- a/bundler/lib/bundler.rb
+++ b/bundler/lib/bundler.rb
@@ -453,7 +453,7 @@ def system_bindir
       # system binaries. If you put '-n foo' in your .gemrc, RubyGems will
       # install binstubs there instead. Unfortunately, RubyGems doesn't expose
       # that directory at all, so rather than parse .gemrc ourselves, we allow
-      # the directory to be set as well, via `bundle config set bindir foo`.
+      # the directory to be set as well, via `bundle config set --local bindir foo`.
       Bundler.settings[:system_bindir] || Bundler.rubygems.gem_bindir
     end
 
diff --git a/bundler/lib/bundler/cli.rb b/bundler/lib/bundler/cli.rb
index d4afab9adb78..3b2e96cf396e 100644
--- a/bundler/lib/bundler/cli.rb
+++ b/bundler/lib/bundler/cli.rb
@@ -565,18 +565,18 @@ def viz
 
     desc "gem NAME [OPTIONS]", "Creates a skeleton for creating a rubygem"
     method_option :exe, :type => :boolean, :default => false, :aliases => ["--bin", "-b"], :desc => "Generate a binary executable for your library."
-    method_option :coc, :type => :boolean, :desc => "Generate a code of conduct file. Set a default with `bundle config set gem.coc true`."
+    method_option :coc, :type => :boolean, :desc => "Generate a code of conduct file. Set a default with `bundle config set --global gem.coc true`."
     method_option :edit, :type => :string, :aliases => "-e", :required => false, :banner => "EDITOR",
                          :lazy_default => [ENV["BUNDLER_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find {|e| !e.nil? && !e.empty? },
                          :desc => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)"
     method_option :ext, :type => :boolean, :default => false, :desc => "Generate the boilerplate for C extension code"
     method_option :git, :type => :boolean, :default => true, :desc => "Initialize a git repo inside your library."
-    method_option :mit, :type => :boolean, :desc => "Generate an MIT license file. Set a default with `bundle config set gem.mit true`."
-    method_option :rubocop, :type => :boolean, :desc => "Add rubocop to the generated Rakefile and gemspec. Set a default with `bundle config set gem.rubocop true`."
+    method_option :mit, :type => :boolean, :desc => "Generate an MIT license file. Set a default with `bundle config set --global gem.mit true`."
+    method_option :rubocop, :type => :boolean, :desc => "Add rubocop to the generated Rakefile and gemspec. Set a default with `bundle config set --global gem.rubocop true`."
     method_option :test, :type => :string, :lazy_default => Bundler.settings["gem.test"] || "", :aliases => "-t", :banner => "Use the specified test framework for your library",
-                         :desc => "Generate a test directory for your library, either rspec, minitest or test-unit. Set a default with `bundle config set gem.test (rspec|minitest|test-unit)`."
+                         :desc => "Generate a test directory for your library, either rspec, minitest or test-unit. Set a default with `bundle config set --global gem.test (rspec|minitest|test-unit)`."
     method_option :ci, :type => :string, :lazy_default => Bundler.settings["gem.ci"] || "",
-                       :desc => "Generate CI configuration, either GitHub Actions, Travis CI, GitLab CI or CircleCI. Set a default with `bundle config set gem.ci (github|travis|gitlab|circle)`"
+                       :desc => "Generate CI configuration, either GitHub Actions, Travis CI, GitLab CI or CircleCI. Set a default with `bundle config set --global gem.ci (github|travis|gitlab|circle)`"
 
     def gem(name)
     end
@@ -744,7 +744,7 @@ def self.reformatted_help_args(args)
 
     # Automatically invoke `bundle install` and resume if
     # Bundler.settings[:auto_install] exists. This is set through config cmd
-    # `bundle config set auto_install 1`.
+    # `bundle config set --global auto_install 1`.
     #
     # Note that this method `nil`s out the global Definition object, so it
     # should be called first, before you instantiate anything like an
@@ -842,7 +842,7 @@ def flag_deprecation(name, flag_name, option)
       Bundler::SharedHelpers.major_deprecation 2,\
         "The `#{flag_name}` flag is deprecated because it relies on being " \
         "remembered across bundler invocations, which bundler will no longer " \
-        "do in future versions. Instead please use `bundle config set #{name.tr("-", "_")} " \
+        "do in future versions. Instead please use `bundle config set --local #{name.tr("-", "_")} " \
         "'#{value}'`, and stop using this flag"
     end
   end
diff --git a/bundler/lib/bundler/dsl.rb b/bundler/lib/bundler/dsl.rb
index b92866b1b440..cbe7b6bb8efd 100644
--- a/bundler/lib/bundler/dsl.rb
+++ b/bundler/lib/bundler/dsl.rb
@@ -457,7 +457,7 @@ def check_primary_source_safety(source_list)
           "Using `source` more than once without a block is a security risk, and " \
           "may result in installing unexpected gems. To resolve this warning, use " \
           "a block to indicate which gems should come from the secondary source. " \
-          "To upgrade this warning to an error, run `bundle config set " \
+          "To upgrade this warning to an error, run `bundle config set --local " \
           "disable_multisource true`."
       end
     end
diff --git a/bundler/lib/bundler/fetcher.rb b/bundler/lib/bundler/fetcher.rb
index f494a7fe6273..2d9b4c294516 100644
--- a/bundler/lib/bundler/fetcher.rb
+++ b/bundler/lib/bundler/fetcher.rb
@@ -47,7 +47,7 @@ def initialize(remote_uri)
         remote_uri = filter_uri(remote_uri)
         super "Authentication is required for #{remote_uri}.\n" \
           "Please supply credentials for this source. You can do this by running:\n" \
-          " bundle config set #{remote_uri} username:password"
+          " bundle config set --global #{remote_uri} username:password"
       end
     end
     # This error is raised if HTTP authentication is provided, but incorrect.
diff --git a/bundler/lib/bundler/lazy_specification.rb b/bundler/lib/bundler/lazy_specification.rb
index 067e2d7a3bf1..546b8d9b098f 100644
--- a/bundler/lib/bundler/lazy_specification.rb
+++ b/bundler/lib/bundler/lazy_specification.rb
@@ -89,7 +89,7 @@ def __materialize__
         if search && Gem::Platform.new(search.platform) != platform_object && !search.runtime_dependencies.-(dependencies.reject {|d| d.type == :development }).empty?
           Bundler.ui.warn "Unable to use the platform-specific (#{search.platform}) version of #{name} (#{version}) " \
             "because it has different dependencies from the #{platform} version. " \
-            "To use the platform-specific version of the gem, run `bundle config set specific_platform true` and install again."
+            "To use the platform-specific version of the gem, run `bundle config set --local specific_platform true` and install again."
           search = source.specs.search(self).last
         end
         search.dependencies = dependencies if search && (search.is_a?(RemoteSpecification) || search.is_a?(EndpointSpecification))
diff --git a/bundler/lib/bundler/rubygems_gem_installer.rb b/bundler/lib/bundler/rubygems_gem_installer.rb
index 912509c812ec..cd5eb152f961 100644
--- a/bundler/lib/bundler/rubygems_gem_installer.rb
+++ b/bundler/lib/bundler/rubygems_gem_installer.rb
@@ -60,7 +60,7 @@ def validate_bundler_checksum(checksum)
 
           If you wish to continue installing the downloaded gem, and are certain it does not pose a \
           security issue despite the mismatching checksum, do the following:
-          1. run `bundle config set disable_checksum_validation true` to turn off checksum verification
+          1. run `bundle config set --local disable_checksum_validation true` to turn off checksum verification
           2. run `bundle install`
 
           (More info: The expected SHA256 checksum was #{checksum.inspect}, but the \
diff --git a/bundler/lib/bundler/source_list.rb b/bundler/lib/bundler/source_list.rb
index 12ac2752fa9a..731a791531cb 100644
--- a/bundler/lib/bundler/source_list.rb
+++ b/bundler/lib/bundler/source_list.rb
@@ -147,7 +147,7 @@ def warn_on_git_protocol(source)
       if source.uri =~ /^git\:/
         Bundler.ui.warn "The git source `#{source.uri}` uses the `git` protocol, " \
           "which transmits data without encryption. Disable this warning with " \
-          "`bundle config set git.allow_insecure true`, or switch to the `https` " \
+          "`bundle config set --local git.allow_insecure true`, or switch to the `https` " \
           "protocol to keep your data secure."
       end
     end
diff --git a/bundler/man/bundle-config.1 b/bundler/man/bundle-config.1
index 86556dc73a2a..023e03f4877d 100644
--- a/bundler/man/bundle-config.1
+++ b/bundler/man/bundle-config.1
@@ -57,13 +57,13 @@ Executing \fBbundle config unset \-\-local <name> <value>\fR will delete the con
 Executing bundle with the \fBBUNDLE_IGNORE_CONFIG\fR environment variable set will cause it to ignore all configuration\.
 .
 .P
-Executing \fBbundle config set disable_multisource true\fR upgrades the warning about the Gemfile containing multiple primary sources to an error\. Executing \fBbundle config unset disable_multisource\fR downgrades this error to a warning\.
+Executing \fBbundle config set \-\-local disable_multisource true\fR upgrades the warning about the Gemfile containing multiple primary sources to an error\. Executing \fBbundle config unset disable_multisource\fR downgrades this error to a warning\.
 .
 .SH "REMEMBERING OPTIONS"
 Flags passed to \fBbundle install\fR or the Bundler runtime, such as \fB\-\-path foo\fR or \fB\-\-without production\fR, are remembered between commands and saved to your local application\'s configuration (normally, \fB\./\.bundle/config\fR)\.
 .
 .P
-However, this will be changed in bundler 3, so it\'s better not to rely on this behavior\. If these options must be remembered, it\'s better to set them using \fBbundle config\fR (e\.g\., \fBbundle config set path foo\fR)\.
+However, this will be changed in bundler 3, so it\'s better not to rely on this behavior\. If these options must be remembered, it\'s better to set them using \fBbundle config\fR (e\.g\., \fBbundle config set \-\-local path foo\fR)\.
 .
 .P
 The options that can be configured are:
@@ -111,7 +111,7 @@ Since the specific location of that executable can change from machine to machin
 .
 .nf
 
-bundle config set build\.mysql \-\-with\-mysql\-config=/usr/local/mysql/bin/mysql_config
+bundle config set \-\-global build\.mysql \-\-with\-mysql\-config=/usr/local/mysql/bin/mysql_config
 .
 .fi
 .
@@ -312,7 +312,7 @@ Bundler also allows you to work against a git repository locally instead of usin
 .
 .nf
 
-bundle config set local\.GEM_NAME /path/to/local/git/repository
+bundle config set \-\-local local\.GEM_NAME /path/to/local/git/repository
 .
 .fi
 .
@@ -325,7 +325,7 @@ For example, in order to use a local Rack repository, a developer could call:
 .
 .nf
 
-bundle config set local\.rack ~/Work/git/rack
+bundle config set \-\-local local\.rack ~/Work/git/rack
 .
 .fi
 .
@@ -347,7 +347,7 @@ Bundler supports overriding gem sources with mirrors\. This allows you to config
 .
 .nf
 
-bundle config set mirror\.SOURCE_URL MIRROR_URL
+bundle config set \-\-global mirror\.SOURCE_URL MIRROR_URL
 .
 .fi
 .
@@ -360,7 +360,7 @@ For example, to use a mirror of rubygems\.org hosted at rubygems\-mirror\.org:
 .
 .nf
 
-bundle config set mirror\.http://rubygems\.org http://rubygems\-mirror\.org
+bundle config set \-\-global mirror\.http://rubygems\.org http://rubygems\-mirror\.org
 .
 .fi
 .
@@ -373,7 +373,7 @@ Each mirror also provides a fallback timeout setting\. If the mirror does not re
 .
 .nf
 
-bundle config set mirror\.SOURCE_URL\.fallback_timeout TIMEOUT
+bundle config set \-\-global mirror\.SOURCE_URL\.fallback_timeout TIMEOUT
 .
 .fi
 .
@@ -386,7 +386,7 @@ For example, to fall back to rubygems\.org after 3 seconds:
 .
 .nf
 
-bundle config set mirror\.https://rubygems\.org\.fallback_timeout 3
+bundle config set \-\-global mirror\.https://rubygems\.org\.fallback_timeout 3
 .
 .fi
 .
@@ -402,7 +402,7 @@ Bundler allows you to configure credentials for any gem source, which allows you
 .
 .nf
 
-bundle config set SOURCE_HOSTNAME USERNAME:PASSWORD
+bundle config set \-\-global SOURCE_HOSTNAME USERNAME:PASSWORD
 .
 .fi
 .
@@ -415,7 +415,7 @@ For example, to save the credentials of user \fBclaudette\fR for the gem source
 .
 .nf
 
-bundle config set gems\.longerous\.com claudette:s00pers3krit
+bundle config set \-\-global gems\.longerous\.com claudette:s00pers3krit
 .
 .fi
 .
@@ -441,7 +441,7 @@ For gems with a git source with HTTP(S) URL you can specify credentials like so:
 .
 .nf
 
-bundle config set https://github\.com/bundler/bundler\.git username:password
+bundle config set \-\-global https://github\.com/bundler/bundler\.git username:password
 .
 .fi
 .
diff --git a/bundler/man/bundle-config.1.txt b/bundler/man/bundle-config.1.txt
index 09023cfea63d..2244814435f8 100644
--- a/bundler/man/bundle-config.1.txt
+++ b/bundler/man/bundle-config.1.txt
@@ -58,8 +58,8 @@ DESCRIPTION
        Executing bundle with the BUNDLE_IGNORE_CONFIG environment variable set
        will cause it to ignore all configuration.
 
-       Executing bundle  config  set  disable_multisource  true  upgrades  the
-       warning  about  the  Gemfile  containing multiple primary sources to an
+       Executing bundle config set --local disable_multisource  true  upgrades
+       the warning about the Gemfile containing multiple primary sources to an
        error. Executing bundle  config  unset  disable_multisource  downgrades
        this error to a warning.
 
@@ -70,27 +70,28 @@ REMEMBERING OPTIONS
 
        However,  this will be changed in bundler 3, so it's better not to rely
        on this behavior. If these options must be remembered, it's  better  to
-       set them using bundle config (e.g., bundle config set path foo).
+       set  them  using  bundle  config  (e.g., bundle config set --local path
+       foo).
 
        The options that can be configured are:
 
-       bin    Creates   a   directory   (defaults  to  ~/bin)  and  place  any
+       bin    Creates  a  directory  (defaults  to  ~/bin)   and   place   any
               executables  from  the  gem  there.  These  executables  run  in
               Bundler's context. If used, you might add this directory to your
-              environment's PATH variable. For  instance,  if  the  rails  gem
+              environment's  PATH  variable.  For  instance,  if the rails gem
               comes with a rails executable, this flag will create a bin/rails
-              executable that ensures that all referred dependencies  will  be
+              executable  that  ensures that all referred dependencies will be
               resolved using the bundled gems.
 
        deployment
-              In  deployment  mode,  Bundler  will  'roll-out'  the bundle for
-              production use. Please check carefully if you want to have  this
+              In deployment mode,  Bundler  will  'roll-out'  the  bundle  for
+              production  use. Please check carefully if you want to have this
               option enabled in development or test environments.
 
-       path   The  location to install the specified gems to. This defaults to
-              Rubygems' setting. Bundler shares this location  with  Rubygems,
-              gem  install  ... will have gem installed there, too. Therefore,
-              gems installed without a --path ...  setting  will  show  up  by
+       path   The location to install the specified gems to. This defaults  to
+              Rubygems'  setting.  Bundler shares this location with Rubygems,
+              gem install ... will have gem installed there,  too.  Therefore,
+              gems  installed  without  a  --path  ... setting will show up by
               calling gem list. Accordingly, gems installed to other locations
               will not get listed.
 
@@ -98,15 +99,15 @@ REMEMBERING OPTIONS
               A space-separated list of groups referencing gems to skip during
               installation.
 
-       with   A  space-separated  list  of  groups referencing gems to include
+       with   A space-separated list of groups  referencing  gems  to  include
               during installation.
 
 BUILD OPTIONS
-       You can use bundle config to give Bundler the flags to pass to the  gem
+       You  can use bundle config to give Bundler the flags to pass to the gem
        installer every time bundler tries to install a particular gem.
 
-       A  very  common  example, the mysql gem, requires Snow Leopard users to
-       pass configuration flags to gem install to specify where  to  find  the
+       A very common example, the mysql gem, requires Snow  Leopard  users  to
+       pass  configuration  flags  to gem install to specify where to find the
        mysql_config executable.
 
 
@@ -115,53 +116,53 @@ BUILD OPTIONS
 
 
 
-       Since  the specific location of that executable can change from machine
+       Since the specific location of that executable can change from  machine
        to machine, you can specify these flags on a per-machine basis.
 
 
 
-           bundle config set build.mysql --with-mysql-config=/usr/local/mysql/bin/mysql_config
+           bundle config set --global build.mysql --with-mysql-config=/usr/local/mysql/bin/mysql_config
 
 
 
-       After running this command, every time bundler  needs  to  install  the
+       After  running  this  command,  every time bundler needs to install the
        mysql gem, it will pass along the flags you specified.
 
 CONFIGURATION KEYS
-       Configuration  keys  in  bundler have two forms: the canonical form and
+       Configuration keys in bundler have two forms: the  canonical  form  and
        the environment variable form.
 
-       For  instance,  passing  the  --without  flag  to   bundle   install(1)
-       bundle-install.1.html  prevents  Bundler from installing certain groups
-       specified  in  the  Gemfile(5).  Bundler   persists   this   value   in
-       app/.bundle/config  so  that  calls to Bundler.setup do not try to find
+       For   instance,   passing  the  --without  flag  to  bundle  install(1)
+       bundle-install.1.html prevents Bundler from installing  certain  groups
+       specified   in   the   Gemfile(5).   Bundler  persists  this  value  in
+       app/.bundle/config so that calls to Bundler.setup do not  try  to  find
        gems from the Gemfile that you didn't install. Additionally, subsequent
-       calls  to bundle install(1) bundle-install.1.html remember this setting
+       calls to bundle install(1) bundle-install.1.html remember this  setting
        and skip those groups.
 
-       The canonical form of this configuration is "without". To  convert  the
-       canonical  form  to  the  environment variable form, capitalize it, and
-       prepend  BUNDLE_.  The  environment  variable  form  of  "without"   is
+       The  canonical  form of this configuration is "without". To convert the
+       canonical form to the environment variable  form,  capitalize  it,  and
+       prepend   BUNDLE_.  The  environment  variable  form  of  "without"  is
        BUNDLE_WITHOUT.
 
-       Any  periods  in  the  configuration  keys  must  be  replaced with two
-       underscores  when   setting   it   via   environment   variables.   The
-       configuration   key   local.rack   becomes   the  environment  variable
+       Any periods in  the  configuration  keys  must  be  replaced  with  two
+       underscores   when   setting   it   via   environment   variables.  The
+       configuration  key  local.rack   becomes   the   environment   variable
        BUNDLE_LOCAL__RACK.
 
 LIST OF AVAILABLE KEYS
-       The following is a list of all configuration keys  and  their  purpose.
-       You   can  learn  more  about  their  operation  in  bundle  install(1)
+       The  following  is  a list of all configuration keys and their purpose.
+       You  can  learn  more  about  their  operation  in  bundle   install(1)
        bundle-install.1.html.
 
        o   allow_bundler_dependency_conflicts
-           (BUNDLE_ALLOW_BUNDLER_DEPENDENCY_CONFLICTS):   Allow  resolving  to
-           specifications  that  have  dependencies  on   bundler   that   are
+           (BUNDLE_ALLOW_BUNDLER_DEPENDENCY_CONFLICTS):  Allow  resolving   to
+           specifications   that   have   dependencies  on  bundler  that  are
            incompatible with the running Bundler version.
 
        o   allow_deployment_source_credential_changes
-           (BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES):    When     in
-           deployment  mode, allow changing the credentials to a gem's source.
+           (BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES):     When    in
+           deployment mode, allow changing the credentials to a gem's  source.
            Ex:               https://some.host.com/gems/path/               ->
            https://user_name:password@some.host.com/gems/path
 
@@ -169,82 +170,82 @@ LIST OF AVAILABLE KEYS
            to use cached data when installing without network access.
 
        o   auto_clean_without_path           (BUNDLE_AUTO_CLEAN_WITHOUT_PATH):
-           Automatically  run  bundle  clean after installing when an explicit
+           Automatically run bundle clean after installing  when  an  explicit
            path has not been set and Bundler is not installing into the system
            gems.
 
-       o   auto_install   (BUNDLE_AUTO_INSTALL):   Automatically   run  bundle
+       o   auto_install  (BUNDLE_AUTO_INSTALL):   Automatically   run   bundle
            install when gems are missing.
 
-       o   bin (BUNDLE_BIN): Install executables from gems in  the  bundle  to
+       o   bin  (BUNDLE_BIN):  Install  executables from gems in the bundle to
            the specified directory. Defaults to false.
 
-       o   cache_all  (BUNDLE_CACHE_ALL):  Cache  all gems, including path and
+       o   cache_all (BUNDLE_CACHE_ALL): Cache all gems,  including  path  and
            git gems.
 
-       o   cache_all_platforms (BUNDLE_CACHE_ALL_PLATFORMS):  Cache  gems  for
+       o   cache_all_platforms  (BUNDLE_CACHE_ALL_PLATFORMS):  Cache  gems for
            all platforms.
 
-       o   cache_path  (BUNDLE_CACHE_PATH):  The  directory  that bundler will
-           place cached gems in when running bundle package, and that  bundler
+       o   cache_path (BUNDLE_CACHE_PATH): The  directory  that  bundler  will
+           place  cached gems in when running bundle package, and that bundler
            will look in when installing gems. Defaults to vendor/cache.
 
-       o   clean  (BUNDLE_CLEAN):  Whether  Bundler  should  run  bundle clean
+       o   clean (BUNDLE_CLEAN):  Whether  Bundler  should  run  bundle  clean
            automatically after bundle install.
 
-       o   console (BUNDLE_CONSOLE): The console that bundle  console  starts.
+       o   console  (BUNDLE_CONSOLE):  The console that bundle console starts.
            Defaults to irb.
 
        o   default_install_uses_path       (BUNDLE_DEFAULT_INSTALL_USES_PATH):
-           Whether a  bundle  install  without  an  explicit  --path  argument
+           Whether  a  bundle  install  without  an  explicit  --path argument
            defaults to installing gems in .bundle.
 
-       o   deployment  (BUNDLE_DEPLOYMENT):  Disallow  changes to the Gemfile.
-           When the Gemfile is changed and the lockfile has not been  updated,
+       o   deployment (BUNDLE_DEPLOYMENT): Disallow changes  to  the  Gemfile.
+           When  the Gemfile is changed and the lockfile has not been updated,
            running Bundler commands will be blocked.
 
        o   disable_checksum_validation   (BUNDLE_DISABLE_CHECKSUM_VALIDATION):
-           Allow installing gems even  if  they  do  not  match  the  checksum
+           Allow  installing  gems  even  if  they  do  not match the checksum
            provided by RubyGems.
 
        o   disable_exec_load  (BUNDLE_DISABLE_EXEC_LOAD):  Stop  Bundler  from
            using load to launch an executable in-process in bundle exec.
 
        o   disable_local_branch_check     (BUNDLE_DISABLE_LOCAL_BRANCH_CHECK):
-           Allow  Bundler  to  use  a  local  git  override  without  a branch
+           Allow Bundler  to  use  a  local  git  override  without  a  branch
            specified in the Gemfile.
 
-       o   disable_multisource   (BUNDLE_DISABLE_MULTISOURCE):    When    set,
+       o   disable_multisource    (BUNDLE_DISABLE_MULTISOURCE):    When   set,
            Gemfiles containing multiple sources will produce errors instead of
            warnings. Use bundle config unset disable_multisource to unset.
 
        o   disable_shared_gems (BUNDLE_DISABLE_SHARED_GEMS): Stop Bundler from
            accessing gems installed to RubyGems' normal location.
 
-       o   disable_version_check  (BUNDLE_DISABLE_VERSION_CHECK): Stop Bundler
-           from  checking  if  a  newer  Bundler  version  is   available   on
+       o   disable_version_check (BUNDLE_DISABLE_VERSION_CHECK): Stop  Bundler
+           from   checking   if  a  newer  Bundler  version  is  available  on
            rubygems.org.
 
-       o   force_ruby_platform    (BUNDLE_FORCE_RUBY_PLATFORM):   Ignore   the
-           current machine's platform and install only ruby platform gems.  As
+       o   force_ruby_platform   (BUNDLE_FORCE_RUBY_PLATFORM):   Ignore    the
+           current  machine's platform and install only ruby platform gems. As
            a result, gems with native extensions will be compiled from source.
 
-       o   frozen  (BUNDLE_FROZEN):  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
+       o   frozen (BUNDLE_FROZEN): 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.
 
-       o   gem.push_key (BUNDLE_GEM__PUSH_KEY): Sets the --key  parameter  for
-           gem  push  when  using  the  rake  release  command  with a private
+       o   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.
 
-       o   gemfile (BUNDLE_GEMFILE): The name of the file that bundler  should
-           use  as  the Gemfile. This location of this file also sets the root
-           of the project, which is used to  resolve  relative  paths  in  the
-           Gemfile,  among  other  things.  By default, bundler will search up
+       o   gemfile  (BUNDLE_GEMFILE): The name of the file that bundler should
+           use as the Gemfile. This location of this file also sets  the  root
+           of  the  project,  which  is  used to resolve relative paths in the
+           Gemfile, among other things. By default,  bundler  will  search  up
            from the current working directory until it finds a Gemfile.
 
-       o   global_gem_cache (BUNDLE_GLOBAL_GEM_CACHE): Whether Bundler  should
+       o   global_gem_cache  (BUNDLE_GLOBAL_GEM_CACHE): Whether Bundler should
            cache all gems globally, rather than locally to the installing Ruby
            installation.
 
@@ -252,77 +253,77 @@ LIST OF AVAILABLE KEYS
            messages will be printed. To silence a single gem, use dot notation
            like ignore_messages.httparty true.
 
-       o   init_gems_rb (BUNDLE_INIT_GEMS_RB) Generate a gems.rb instead of  a
+       o   init_gems_rb  (BUNDLE_INIT_GEMS_RB) Generate a gems.rb instead of a
            Gemfile when running bundle init.
 
-       o   jobs  (BUNDLE_JOBS):  The  number  of  gems  Bundler can install in
+       o   jobs (BUNDLE_JOBS): The number  of  gems  Bundler  can  install  in
            parallel. Defaults to 1.
 
-       o   no_install (BUNDLE_NO_INSTALL): Whether bundle package should  skip
+       o   no_install  (BUNDLE_NO_INSTALL): Whether bundle package should skip
            installing gems.
 
-       o   no_prune  (BUNDLE_NO_PRUNE):  Whether Bundler should leave outdated
+       o   no_prune (BUNDLE_NO_PRUNE): Whether Bundler should  leave  outdated
            gems unpruned when caching.
 
        o   only_update_to_newer_versions
-           (BUNDLE_ONLY_UPDATE_TO_NEWER_VERSIONS):  During bundle update, only
+           (BUNDLE_ONLY_UPDATE_TO_NEWER_VERSIONS): During bundle update,  only
            resolve to newer versions of the gems in the lockfile.
 
-       o   path (BUNDLE_PATH): The location on disk where  all  gems  in  your
+       o   path  (BUNDLE_PATH):  The  location  on disk where all gems in your
            bundle will be located regardless of $GEM_HOME or $GEM_PATH values.
-           Bundle gems not found in this location will be installed by  bundle
-           install.  Defaults  to Gem.dir. When --deployment is used, defaults
+           Bundle  gems not found in this location will be installed by bundle
+           install. Defaults to Gem.dir. When --deployment is  used,  defaults
            to vendor/bundle.
 
-       o   path.system (BUNDLE_PATH__SYSTEM):  Whether  Bundler  will  install
+       o   path.system  (BUNDLE_PATH__SYSTEM):  Whether  Bundler  will install
            gems into the default system path (Gem.dir).
 
-       o   path_relative_to_cwd   (BUNDLE_PATH_RELATIVE_TO_CWD)  Makes  --path
+       o   path_relative_to_cwd  (BUNDLE_PATH_RELATIVE_TO_CWD)  Makes   --path
            relative to the CWD instead of the Gemfile.
 
        o   plugins  (BUNDLE_PLUGINS):  Enable  Bundler's  experimental  plugin
            system.
 
-       o   prefer_patch  (BUNDLE_PREFER_PATCH):  Prefer  updating only to next
-           patch version during updates. Makes bundle update calls  equivalent
+       o   prefer_patch (BUNDLE_PREFER_PATCH): Prefer updating  only  to  next
+           patch  version during updates. Makes bundle update calls equivalent
            to bundler update --patch.
 
-       o   print_only_version_number  (BUNDLE_PRINT_ONLY_VERSION_NUMBER) Print
+       o   print_only_version_number (BUNDLE_PRINT_ONLY_VERSION_NUMBER)  Print
            only version number from bundler --version.
 
-       o   redirect (BUNDLE_REDIRECT): The number  of  redirects  allowed  for
+       o   redirect  (BUNDLE_REDIRECT):  The  number  of redirects allowed for
            network requests. Defaults to 5.
 
-       o   retry  (BUNDLE_RETRY):  The number of times to retry failed network
+       o   retry (BUNDLE_RETRY): The number of times to retry  failed  network
            requests. Defaults to 3.
 
        o   setup_makes_kernel_gem_public
            (BUNDLE_SETUP_MAKES_KERNEL_GEM_PUBLIC): Have Bundler.setup make the
-           Kernel#gem method public,  even  though  RubyGems  declares  it  as
+           Kernel#gem  method  public,  even  though  RubyGems  declares it as
            private.
 
-       o   shebang  (BUNDLE_SHEBANG):  The program name that should be invoked
-           for generated binstubs. Defaults to the ruby install name  used  to
+       o   shebang (BUNDLE_SHEBANG): The program name that should  be  invoked
+           for  generated  binstubs. Defaults to the ruby install name used to
            generate the binstub.
 
        o   silence_deprecations (BUNDLE_SILENCE_DEPRECATIONS): Whether Bundler
-           should silence deprecation  warnings  for  behavior  that  will  be
+           should  silence  deprecation  warnings  for  behavior  that will be
            changed in the next major version.
 
-       o   silence_root_warning   (BUNDLE_SILENCE_ROOT_WARNING):  Silence  the
+       o   silence_root_warning  (BUNDLE_SILENCE_ROOT_WARNING):  Silence   the
            warning Bundler prints when installing gems as root.
 
-       o   specific_platform  (BUNDLE_SPECIFIC_PLATFORM):  Allow  bundler   to
-           resolve  for  the  specific  running  platform  and store it in the
-           lockfile, instead of only using  a  generic  platform.  A  specific
-           platform    is    the    exact    platform   triple   reported   by
-           Gem::Platform.local,     such      as      x86_64-darwin-16      or
-           universal-java-1.8.  On the other hand, generic platforms are those
-           such as ruby, mswin, or java.  In  this  example,  x86_64-darwin-16
+       o   specific_platform   (BUNDLE_SPECIFIC_PLATFORM):  Allow  bundler  to
+           resolve for the specific running  platform  and  store  it  in  the
+           lockfile,  instead  of  only  using  a generic platform. A specific
+           platform   is   the   exact    platform    triple    reported    by
+           Gem::Platform.local,      such      as      x86_64-darwin-16     or
+           universal-java-1.8. On the other hand, generic platforms are  those
+           such  as  ruby,  mswin,  or java. In this example, x86_64-darwin-16
            would map to ruby and universal-java-1.8 to java.
 
-       o   ssl_ca_cert   (BUNDLE_SSL_CA_CERT):   Path   to   a  designated  CA
-           certificate file or folder  containing  multiple  certificates  for
+       o   ssl_ca_cert  (BUNDLE_SSL_CA_CERT):  Path   to   a   designated   CA
+           certificate  file  or  folder  containing multiple certificates for
            trusted CAs in PEM format.
 
        o   ssl_client_cert (BUNDLE_SSL_CLIENT_CERT): Path to a designated file
@@ -332,51 +333,51 @@ LIST OF AVAILABLE KEYS
            Bundler uses when making HTTPS requests. Defaults to verify peer.
 
        o   suppress_install_using_messages
-           (BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES): Avoid printing Using  ...
-           messages  during  installation  when  the  version of a gem has not
+           (BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES):  Avoid printing Using ...
+           messages during installation when the version  of  a  gem  has  not
            changed.
 
-       o   system_bindir (BUNDLE_SYSTEM_BINDIR): The location  where  RubyGems
+       o   system_bindir  (BUNDLE_SYSTEM_BINDIR):  The location where RubyGems
            installs binstubs. Defaults to Gem.bindir.
 
        o   timeout (BUNDLE_TIMEOUT): The seconds allowed before timing out for
            network requests. Defaults to 10.
 
        o   unlock_source_unlocks_spec     (BUNDLE_UNLOCK_SOURCE_UNLOCKS_SPEC):
-           Whether  running bundle update --source NAME unlocks a gem with the
+           Whether running bundle update --source NAME unlocks a gem with  the
            given name. Defaults to true.
 
-       o   update_requires_all_flag (BUNDLE_UPDATE_REQUIRES_ALL_FLAG)  Require
-           passing  --all  to bundle update when everything should be updated,
+       o   update_requires_all_flag  (BUNDLE_UPDATE_REQUIRES_ALL_FLAG) Require
+           passing --all to bundle update when everything should  be  updated,
            and disallow passing no options to bundle update.
 
-       o   user_agent (BUNDLE_USER_AGENT):  The  custom  user  agent  fragment
+       o   user_agent  (BUNDLE_USER_AGENT):  The  custom  user  agent fragment
            Bundler includes in API requests.
 
        o   with (BUNDLE_WITH): A :-separated list of groups whose gems bundler
            should install.
 
-       o   without (BUNDLE_WITHOUT): A :-separated list of groups  whose  gems
+       o   without  (BUNDLE_WITHOUT):  A :-separated list of groups whose gems
            bundler should not install.
 
 
 
-       In  general, you should set these settings per-application by using the
-       applicable flag  to  the  bundle  install(1)  bundle-install.1.html  or
+       In general, you should set these settings per-application by using  the
+       applicable  flag  to  the  bundle  install(1)  bundle-install.1.html or
        bundle package(1) bundle-package.1.html command.
 
-       You  can  set  them globally either via environment variables or bundle
-       config, whichever is preferable  for  your  setup.  If  you  use  both,
+       You can set them globally either via environment  variables  or  bundle
+       config,  whichever  is  preferable  for  your  setup.  If you use both,
        environment variables will take preference over global settings.
 
 LOCAL GIT REPOS
-       Bundler  also  allows  you  to  work  against  a git repository locally
+       Bundler also allows you  to  work  against  a  git  repository  locally
        instead of using the remote version. This can be achieved by setting up
        a local override:
 
 
 
-           bundle config set local.GEM_NAME /path/to/local/git/repository
+           bundle config set --local local.GEM_NAME /path/to/local/git/repository
 
 
 
@@ -385,26 +386,26 @@ LOCAL GIT REPOS
 
 
 
-           bundle config set local.rack ~/Work/git/rack
+           bundle config set --local local.rack ~/Work/git/rack
 
 
 
-       Now instead of checking  out  the  remote  git  repository,  the  local
-       override  will  be used. Similar to a path source, every time the local
-       git repository change, changes  will  be  automatically  picked  up  by
-       Bundler.  This  means  a  commit  in the local git repo will update the
-       revision in the Gemfile.lock to  the  local  git  repo  revision.  This
-       requires  the  same  attention as git submodules. Before pushing to the
+       Now  instead  of  checking  out  the  remote  git repository, the local
+       override will be used. Similar to a path source, every time  the  local
+       git  repository  change,  changes  will  be  automatically picked up by
+       Bundler. This means a commit in the local  git  repo  will  update  the
+       revision  in  the  Gemfile.lock  to  the  local git repo revision. This
+       requires the same attention as git submodules. Before  pushing  to  the
        remote, you need to ensure the local override was pushed, otherwise you
-       may  point  to  a commit that only exists in your local machine. You'll
+       may point to a commit that only exists in your  local  machine.  You'll
        also need to CGI escape your usernames and passwords as well.
 
-       Bundler does many checks to ensure a developer won't work with  invalid
-       references.  Particularly,  we force a developer to specify a branch in
-       the Gemfile in order to use this feature. If the  branch  specified  in
-       the  Gemfile  and the current branch in the local git repository do not
-       match, Bundler will abort. This ensures  that  a  developer  is  always
-       working  against  the correct branches, and prevents accidental locking
+       Bundler  does many checks to ensure a developer won't work with invalid
+       references. Particularly, we force a developer to specify a  branch  in
+       the  Gemfile  in  order to use this feature. If the branch specified in
+       the Gemfile and the current branch in the local git repository  do  not
+       match,  Bundler  will  abort.  This  ensures that a developer is always
+       working against the correct branches, and prevents  accidental  locking
        to a different branch.
 
        Finally,  Bundler  also  ensures  that  the  current  revision  in  the
@@ -412,32 +413,32 @@ LOCAL GIT REPOS
        forces you to fetch the latest changes in the remotes.
 
 MIRRORS OF GEM SOURCES
-       Bundler supports overriding gem sources with mirrors. This  allows  you
+       Bundler  supports  overriding gem sources with mirrors. This allows you
        to configure rubygems.org as the gem source in your Gemfile while still
        using your mirror to fetch gems.
 
 
 
-           bundle config set mirror.SOURCE_URL MIRROR_URL
+           bundle config set --global mirror.SOURCE_URL MIRROR_URL
 
 
 
-       For  example,   to   use   a   mirror   of   rubygems.org   hosted   at
+       For   example,   to   use   a   mirror   of   rubygems.org   hosted  at
        rubygems-mirror.org:
 
 
 
-           bundle config set mirror.http://rubygems.org http://rubygems-mirror.org
+           bundle config set --global mirror.http://rubygems.org http://rubygems-mirror.org
 
 
 
-       Each  mirror  also  provides  a fallback timeout setting. If the mirror
-       does not respond within the fallback timeout, Bundler will try  to  use
+       Each mirror also provides a fallback timeout  setting.  If  the  mirror
+       does  not  respond within the fallback timeout, Bundler will try to use
        the original server instead of the mirror.
 
 
 
-           bundle config set mirror.SOURCE_URL.fallback_timeout TIMEOUT
+           bundle config set --global mirror.SOURCE_URL.fallback_timeout TIMEOUT
 
 
 
@@ -445,29 +446,29 @@ MIRRORS OF GEM SOURCES
 
 
 
-           bundle config set mirror.https://rubygems.org.fallback_timeout 3
+           bundle config set --global mirror.https://rubygems.org.fallback_timeout 3
 
 
 
-       The  default  fallback  timeout  is  0.1  seconds,  but the setting can
+       The default fallback timeout  is  0.1  seconds,  but  the  setting  can
        currently only accept whole seconds (for example, 1, 15, or 30).
 
 CREDENTIALS FOR GEM SOURCES
-       Bundler allows you to configure credentials for any gem  source,  which
+       Bundler  allows  you to configure credentials for any gem source, which
        allows you to avoid putting secrets into your Gemfile.
 
 
 
-           bundle config set SOURCE_HOSTNAME USERNAME:PASSWORD
+           bundle config set --global SOURCE_HOSTNAME USERNAME:PASSWORD
 
 
 
-       For  example,  to  save  the  credentials of user claudette for the gem
+       For example, to save the credentials of  user  claudette  for  the  gem
        source at gems.longerous.com, you would run:
 
 
 
-           bundle config set gems.longerous.com claudette:s00pers3krit
+           bundle config set --global gems.longerous.com claudette:s00pers3krit
 
 
 
@@ -484,7 +485,7 @@ CREDENTIALS FOR GEM SOURCES
 
 
 
-           bundle config set https://github.com/bundler/bundler.git username:password
+           bundle config set --global https://github.com/bundler/bundler.git username:password
 
 
 
@@ -496,7 +497,7 @@ CREDENTIALS FOR GEM SOURCES
 
 
 
-       This  is  especially  useful  for private repositories on hosts such as
+       This is especially useful for private repositories  on  hosts  such  as
        Github, where you can use personal OAuth tokens:
 
 
@@ -506,10 +507,10 @@ CREDENTIALS FOR GEM SOURCES
 
 
 CONFIGURE BUNDLER DIRECTORIES
-       Bundler's home, config, cache and plugin directories  are  able  to  be
-       configured  through  environment  variables.  The  default location for
-       Bundler's home directory is ~/.bundle, which  all  directories  inherit
-       from  by  default.  The  following  outlines  the available environment
+       Bundler's  home,  config,  cache  and plugin directories are able to be
+       configured through environment  variables.  The  default  location  for
+       Bundler's  home  directory  is ~/.bundle, which all directories inherit
+       from by default.  The  following  outlines  the  available  environment
        variables and their default values
 
 
diff --git a/bundler/man/bundle-config.ronn b/bundler/man/bundle-config.ronn
index a2cb42bc359c..9b8eb94c1b4e 100644
--- a/bundler/man/bundle-config.ronn
+++ b/bundler/man/bundle-config.ronn
@@ -47,7 +47,7 @@ configuration only from the local application.
 Executing bundle with the `BUNDLE_IGNORE_CONFIG` environment variable set will
 cause it to ignore all configuration.
 
-Executing `bundle config set disable_multisource true` upgrades the warning about
+Executing `bundle config set --local disable_multisource true` upgrades the warning about
 the Gemfile containing multiple primary sources to an error. Executing `bundle
 config unset disable_multisource` downgrades this error to a warning.
 
@@ -59,7 +59,7 @@ application's configuration (normally, `./.bundle/config`).
 
 However, this will be changed in bundler 3, so it's better not to rely on this
 behavior. If these options must be remembered, it's better to set them using
-`bundle config` (e.g., `bundle config set path foo`).
+`bundle config` (e.g., `bundle config set --local path foo`).
 
 The options that can be configured are:
 
@@ -103,7 +103,7 @@ pass configuration flags to `gem install` to specify where to find the
 Since the specific location of that executable can change from machine
 to machine, you can specify these flags on a per-machine basis.
 
-    bundle config set build.mysql --with-mysql-config=/usr/local/mysql/bin/mysql_config
+    bundle config set --global build.mysql --with-mysql-config=/usr/local/mysql/bin/mysql_config
 
 After running this command, every time bundler needs to install the
 `mysql` gem, it will pass along the flags you specified.
@@ -299,11 +299,11 @@ Bundler also allows you to work against a git repository locally
 instead of using the remote version. This can be achieved by setting
 up a local override:
 
-    bundle config set local.GEM_NAME /path/to/local/git/repository
+    bundle config set --local local.GEM_NAME /path/to/local/git/repository
 
 For example, in order to use a local Rack repository, a developer could call:
 
-    bundle config set local.rack ~/Work/git/rack
+    bundle config set --local local.rack ~/Work/git/rack
 
 Now instead of checking out the remote git repository, the local
 override will be used. Similar to a path source, every time the local
@@ -333,21 +333,21 @@ Bundler supports overriding gem sources with mirrors. This allows you to
 configure rubygems.org as the gem source in your Gemfile while still using your
 mirror to fetch gems.
 
-    bundle config set mirror.SOURCE_URL MIRROR_URL
+    bundle config set --global mirror.SOURCE_URL MIRROR_URL
 
 For example, to use a mirror of rubygems.org hosted at rubygems-mirror.org:
 
-    bundle config set mirror.http://rubygems.org http://rubygems-mirror.org
+    bundle config set --global mirror.http://rubygems.org http://rubygems-mirror.org
 
 Each mirror also provides a fallback timeout setting. If the mirror does not
 respond within the fallback timeout, Bundler will try to use the original
 server instead of the mirror.
 
-    bundle config set mirror.SOURCE_URL.fallback_timeout TIMEOUT
+    bundle config set --global mirror.SOURCE_URL.fallback_timeout TIMEOUT
 
 For example, to fall back to rubygems.org after 3 seconds:
 
-    bundle config set mirror.https://rubygems.org.fallback_timeout 3
+    bundle config set --global mirror.https://rubygems.org.fallback_timeout 3
 
 The default fallback timeout is 0.1 seconds, but the setting can currently
 only accept whole seconds (for example, 1, 15, or 30).
@@ -357,12 +357,12 @@ only accept whole seconds (for example, 1, 15, or 30).
 Bundler allows you to configure credentials for any gem source, which allows
 you to avoid putting secrets into your Gemfile.
 
-    bundle config set SOURCE_HOSTNAME USERNAME:PASSWORD
+    bundle config set --global SOURCE_HOSTNAME USERNAME:PASSWORD
 
 For example, to save the credentials of user `claudette` for the gem source at
 `gems.longerous.com`, you would run:
 
-    bundle config set gems.longerous.com claudette:s00pers3krit
+    bundle config set --global gems.longerous.com claudette:s00pers3krit
 
 Or you can set the credentials as an environment variable like this:
 
@@ -370,7 +370,7 @@ Or you can set the credentials as an environment variable like this:
 
 For gems with a git source with HTTP(S) URL you can specify credentials like so:
 
-    bundle config set https://github.com/bundler/bundler.git username:password
+    bundle config set --global https://github.com/bundler/bundler.git username:password
 
 Or you can set the credentials as an environment variable like so:
 
diff --git a/bundler/man/gemfile.5 b/bundler/man/gemfile.5
index 5e913c8c7022..f9a718899280 100644
--- a/bundler/man/gemfile.5
+++ b/bundler/man/gemfile.5
@@ -227,8 +227,8 @@ To specify multiple groups to ignore, specify a list of groups separated by spac
 .
 .nf
 
-bundle config set without test
-bundle config set without development test
+bundle config set \-\-local without test
+bundle config set \-\-local without development test
 .
 .fi
 .
diff --git a/bundler/man/gemfile.5.ronn b/bundler/man/gemfile.5.ronn
index 832577130cee..bdb0f3e1fbd6 100644
--- a/bundler/man/gemfile.5.ronn
+++ b/bundler/man/gemfile.5.ronn
@@ -163,8 +163,8 @@ not install with the `without` configuration.
 
 To specify multiple groups to ignore, specify a list of groups separated by spaces.
 
-    bundle config set without test
-    bundle config set without development test
+    bundle config set --local without test
+    bundle config set --local without development test
 
 Also, calling `Bundler.setup` with no parameters, or calling `require "bundler/setup"`
 will setup all groups except for the ones you excluded via `--without` (since they
diff --git a/bundler/man/gemfile.5.txt b/bundler/man/gemfile.5.txt
index 6dcb37fb0c9d..6d705185d357 100644
--- a/bundler/man/gemfile.5.txt
+++ b/bundler/man/gemfile.5.txt
@@ -211,8 +211,8 @@ GEMS
 
 
 
-           bundle config set without test
-           bundle config set without development test
+           bundle config set --local without test
+           bundle config set --local without development test
 
 
 
diff --git a/bundler/spec/bundler/source_list_spec.rb b/bundler/spec/bundler/source_list_spec.rb
index 93159998c6f4..3a0691b95987 100644
--- a/bundler/spec/bundler/source_list_spec.rb
+++ b/bundler/spec/bundler/source_list_spec.rb
@@ -75,7 +75,7 @@
         let(:msg) do
           "The git source `git://existing-git.org/path.git` " \
           "uses the `git` protocol, which transmits data without encryption. " \
-          "Disable this warning with `bundle config set git.allow_insecure true`, " \
+          "Disable this warning with `bundle config set --local git.allow_insecure true`, " \
           "or switch to the `https` protocol to keep your data secure."
         end
 
diff --git a/bundler/spec/commands/outdated_spec.rb b/bundler/spec/commands/outdated_spec.rb
index 2a07f1c78458..1faee23f26af 100644
--- a/bundler/spec/commands/outdated_spec.rb
+++ b/bundler/spec/commands/outdated_spec.rb
@@ -555,7 +555,7 @@ def test_group_option(group)
     end
   end
 
-  context "after bundle config set deployment true" do
+  context "after bundle config set --local deployment true" do
     before do
       install_gemfile <<-G
         source "#{file_uri_for(gem_repo2)}"
@@ -563,7 +563,7 @@ def test_group_option(group)
         gem "rack"
         gem "foo"
       G
-      bundle "config set deployment true"
+      bundle "config set --local deployment true"
     end
 
     it "outputs a helpful message about being in deployment mode" do
diff --git a/bundler/spec/install/gemfile/platform_spec.rb b/bundler/spec/install/gemfile/platform_spec.rb
index dd58aef29b1d..07e5048f249e 100644
--- a/bundler/spec/install/gemfile/platform_spec.rb
+++ b/bundler/spec/install/gemfile/platform_spec.rb
@@ -250,7 +250,7 @@
 
     expect(err).to include "Unable to use the platform-specific (universal-darwin) version of facter (2.4.6) " \
       "because it has different dependencies from the ruby version. " \
-      "To use the platform-specific version of the gem, run `bundle config set specific_platform true` and install again."
+      "To use the platform-specific version of the gem, run `bundle config set --local specific_platform true` and install again."
 
     expect(the_bundle).to include_gem "facter 2.4.6"
     expect(the_bundle).not_to include_gem "CFPropertyList"
diff --git a/bundler/spec/install/gems/compact_index_spec.rb b/bundler/spec/install/gems/compact_index_spec.rb
index 6e5177c60d79..5ef3f38fe72e 100644
--- a/bundler/spec/install/gems/compact_index_spec.rb
+++ b/bundler/spec/install/gems/compact_index_spec.rb
@@ -690,7 +690,7 @@ def require(*args)
 
       it "shows instructions if auth is not provided for the source" do
         bundle :install, :artifice => "compact_index_strict_basic_authentication", :raise_on_error => false
-        expect(err).to include("bundle config set #{source_hostname} username:password")
+        expect(err).to include("bundle config set --global #{source_hostname} username:password")
       end
 
       it "fails if authentication has already been provided, but failed" do
@@ -878,7 +878,7 @@ def start
         and include("1. delete the downloaded gem located at: `#{default_bundle_path}/gems/rack-1.0.0/rack-1.0.0.gem`").
         and include("2. run `bundle install`").
         and include("If you wish to continue installing the downloaded gem, and are certain it does not pose a security issue despite the mismatching checksum, do the following:").
-        and include("1. run `bundle config set disable_checksum_validation true` to turn off checksum verification").
+        and include("1. run `bundle config set --local disable_checksum_validation true` to turn off checksum verification").
         and include("2. run `bundle install`").
         and match(/\(More info: The expected SHA256 checksum was "#{"ab" * 22}", but the checksum for the downloaded gem was ".+?"\.\)/)
     end
diff --git a/bundler/spec/install/gems/dependency_api_spec.rb b/bundler/spec/install/gems/dependency_api_spec.rb
index 765b5e519574..e92669e97c53 100644
--- a/bundler/spec/install/gems/dependency_api_spec.rb
+++ b/bundler/spec/install/gems/dependency_api_spec.rb
@@ -664,7 +664,7 @@ def require(*args)
 
       it "shows instructions if auth is not provided for the source" do
         bundle :install, :artifice => "endpoint_strict_basic_authentication", :raise_on_error => false
-        expect(err).to include("bundle config set #{source_hostname} username:password")
+        expect(err).to include("bundle config set --global #{source_hostname} username:password")
       end
 
       it "fails if authentication has already been provided, but failed" do
diff --git a/bundler/spec/other/major_deprecation_spec.rb b/bundler/spec/other/major_deprecation_spec.rb
index 4982656ce0a0..e8884a40b25c 100644
--- a/bundler/spec/other/major_deprecation_spec.rb
+++ b/bundler/spec/other/major_deprecation_spec.rb
@@ -113,7 +113,7 @@
       expect(deprecations).to include(
         "The `--path` flag is deprecated because it relies on being " \
         "remembered across bundler invocations, which bundler will no " \
-        "longer do in future versions. Instead please use `bundle config set " \
+        "longer do in future versions. Instead please use `bundle config set --local " \
         "path 'vendor/bundle'`, and stop using this flag"
       )
     end
@@ -135,7 +135,7 @@
       expect(deprecations).to include(
         "The `--path` flag is deprecated because it relies on being " \
         "remembered across bundler invocations, which bundler will no " \
-        "longer do in future versions. Instead please use `bundle config set " \
+        "longer do in future versions. Instead please use `bundle config set --local " \
         "path 'vendor/bundle'`, and stop using this flag"
       )
     end
@@ -339,7 +339,7 @@
             "The `#{flag_name}` flag is deprecated because it relies on " \
             "being remembered across bundler invocations, which bundler " \
             "will no longer do in future versions. Instead please use " \
-            "`bundle config set #{option_name} '#{value}'`, and stop using this flag"
+            "`bundle config set --local #{option_name} '#{value}'`, and stop using this flag"
           )
         end
 
@@ -362,7 +362,7 @@
         "Using `source` more than once without a block is a security risk, and " \
         "may result in installing unexpected gems. To resolve this warning, use " \
         "a block to indicate which gems should come from the secondary source. " \
-        "To upgrade this warning to an error, run `bundle config set " \
+        "To upgrade this warning to an error, run `bundle config set --local " \
         "disable_multisource true`."
       )
     end