Merge upstream changes from 2-0-stable branch of bundler/bundler.

  * It update bundler 2 mode to bundler 3.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

6 files changed, 41 insertions, 9 deletions

diff --git a/man/bundle-config.1 b/man/bundle-config.1
index c250975a6c..8c0b3683c6 100644
--- a/man/bundle-config.1
+++ b/man/bundle-config.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-CONFIG" "1" "October 2018" "" ""
+.TH "BUNDLE\-CONFIG" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-config\fR \- Set bundler configuration options
@@ -238,7 +238,7 @@ The following is a list of all configuration keys and their purpose\. You can le
 \fBpath\.system\fR (\fBBUNDLE_PATH__SYSTEM\fR): Whether Bundler will install gems into the default system path (\fBGem\.dir\fR)\.
 .
 .IP "\(bu" 4
-\fBpath_relative_to_cwd\fR (\fBPATH_RELATIVE_TO_CWD\fR) Makes \fB\-\-path\fR relative to the CWD instead of the \fBGemfile\fR\.
+\fBpath_relative_to_cwd\fR (\fBBUNDLE_PATH_RELATIVE_TO_CWD\fR) Makes \fB\-\-path\fR relative to the CWD instead of the \fBGemfile\fR\.
 .
 .IP "\(bu" 4
 \fBplugins\fR (\fBBUNDLE_PLUGINS\fR): Enable Bundler\'s experimental plugin system\.
@@ -478,4 +478,20 @@ export BUNDLE_GITHUB__COM=abcd0123generatedtoken:x\-oauth\-basic
 .fi
 .
 .IP "" 0
+.
+.SH "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 \fB~/\.bundle\fR, which all directories inherit from by default\. The following outlines the available environment variables and their default values
+.
+.IP "" 4
+.
+.nf
+
+BUNDLE_USER_HOME : $HOME/\.bundle
+BUNDLE_USER_CACHE : $BUNDLE_USER_HOME/cache
+BUNDLE_USER_CONFIG : $BUNDLE_USER_HOME/config
+BUNDLE_USER_PLUGIN : $BUNDLE_USER_HOME/plugin
+.
+.fi
+.
+.IP "" 0
 
diff --git a/man/bundle-config.1.txt b/man/bundle-config.1.txt
index 0a999e8a97..9b07159342 100644
--- a/man/bundle-config.1.txt
+++ b/man/bundle-config.1.txt
@@ -282,8 +282,8 @@ BUNDLE-CONFIG(1)					      BUNDLE-CONFIG(1)
        o   1mpath.system  22m(1mBUNDLE_PATH__SYSTEM22m):  Whether  Bundler  will install
 	   gems into the default system path (1mGem.dir22m).
 
-       o   1mpath_relative_to_cwd 22m(1mPATH_RELATIVE_TO_CWD22m) Makes	1m--path  22mrelative
-	   to the CWD instead of the 1mGemfile22m.
+       o   1mpath_relative_to_cwd  22m(1mBUNDLE_PATH_RELATIVE_TO_CWD22m)  Makes   1m--path0m
+	   relative to the CWD instead of the 1mGemfile22m.
 
        o   1mplugins 22m(1mBUNDLE_PLUGINS22m): Enable Bundler's experimental plugin sys-
 	   tem.
@@ -507,7 +507,23 @@ BUNDLE-CONFIG(1)					      BUNDLE-CONFIG(1)
 
 
 
+1mCONFIGURE BUNDLER DIRECTORIES0m
+       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 1m~/.bundle22m, which  all  directories  inherit
+       from by default. The following outlines the available environment vari-
+       ables and their default values
 
 
 
-				 October 2018		      BUNDLE-CONFIG(1)
+	   BUNDLE_USER_HOME : $HOME/.bundle
+	   BUNDLE_USER_CACHE : $BUNDLE_USER_HOME/cache
+	   BUNDLE_USER_CONFIG : $BUNDLE_USER_HOME/config
+	   BUNDLE_USER_PLUGIN : $BUNDLE_USER_HOME/plugin
+
+
+
+
+
+
+				 November 2018		      BUNDLE-CONFIG(1)
diff --git a/man/bundle-install.1 b/man/bundle-install.1
index 6026713af1..2549562b76 100644
--- a/man/bundle-install.1
+++ b/man/bundle-install.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-INSTALL" "1" "October 2018" "" ""
+.TH "BUNDLE\-INSTALL" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-install\fR \- Install the dependencies specified in your Gemfile
diff --git a/man/bundle-install.1.txt b/man/bundle-install.1.txt
index 1b7f3adcdf..004a5224b2 100644
--- a/man/bundle-install.1.txt
+++ b/man/bundle-install.1.txt
@@ -398,4 +398,4 @@ BUNDLE-INSTALL(1)					     BUNDLE-INSTALL(1)
 
 
 
-				 October 2018		     BUNDLE-INSTALL(1)
+				 November 2018		     BUNDLE-INSTALL(1)
diff --git a/man/bundle-update.1 b/man/bundle-update.1
index 49f51c09a8..3a303b582d 100644
--- a/man/bundle-update.1
+++ b/man/bundle-update.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-UPDATE" "1" "October 2018" "" ""
+.TH "BUNDLE\-UPDATE" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-update\fR \- Update your gems to the latest available versions
diff --git a/man/bundle-update.1.txt b/man/bundle-update.1.txt
index d2ec46444b..573842858d 100644
--- a/man/bundle-update.1.txt
+++ b/man/bundle-update.1.txt
@@ -387,4 +387,4 @@ BUNDLE-UPDATE(1)					      BUNDLE-UPDATE(1)
 
 
 
-				 October 2018		      BUNDLE-UPDATE(1)
+				 November 2018		      BUNDLE-UPDATE(1)