Merge Bundler 2.1.0.pre.3

  Features:
    - Add caller information to some deprecation messages to make them easier to fix [#7361](https://github.com/bundler/bundler/pull/7361)
    - Reconcile `bundle cache` vs `bundle package` everywhere. Now in docs, CLI help and everywhere else `bundle cache` is the preferred version and `bundle package` remains as an alias [#7389](https://github.com/bundler/bundler/pull/7389)
    - Display some basic `bundler` documentation together with ruby's RDoc based documentation [#7394](https://github.com/bundler/bundler/pull/7394)

  Bugfixes:
    - Fix typos deprecation message and upgrading docs [#7374](https://github.com/bundler/bundler/pull/7374)
    - Deprecation warnings about `taint` usage on ruby 2.7 [#7385](https://github.com/bundler/bundler/pull/7385)
    - Fix `--help` flag not correctly delegating to `man` when used with command aliases [#7388](https://github.com/bundler/bundler/pull/7388)
    - `bundle add` should cache newly added gems if an application cache exists [#7393](https://github.com/bundler/bundler/pull/7393)
    - Stop using an insecure folder as a "fallback home" when user home is not defined [#7416](https://github.com/bundler/bundler/pull/7416)
    - Fix `bundler/inline` warning about `Bundler.root` redefinition [#7417](https://github.com/bundler/bundler/pull/7417)

1 files changed, 16 insertions, 16 deletions

diff --git a/man/bundle-lock.1.txt b/man/bundle-lock.1.txt
index 81e735419c..b8f18c13e0 100644
--- a/man/bundle-lock.1.txt
+++ b/man/bundle-lock.1.txt
@@ -16,16 +16,16 @@ DESCRIPTION
 OPTIONS
        --update=<*gems>
 	      Ignores  the  existing  lockfile. Resolve then updates lockfile.
-	      Taking a list of gems or updating all gems if no list is	given.
+	      Taking a list of gems or updating all gems if no list is given.
 
        --local
 	      Do not attempt to connect to rubygems.org. Instead, Bundler will
-	      use the gems already present  in	Rubygems'  cache  or  in  ven-
-	      dor/cache.  Note	that  if  a  appropriate platform-specific gem
+	      use  the	gems  already  present	in  Rubygems' cache or in ven-
+	      dor/cache. Note that  if	a  appropriate	platform-specific  gem
 	      exists on rubygems.org it will not be found.
 
        --print
-	      Prints the lockfile to STDOUT instead of	writing  to  the  file
+	      Prints  the  lockfile  to  STDOUT instead of writing to the file
 	      system.
 
        --lockfile=<path>
@@ -35,7 +35,7 @@ OPTIONS
 	      Fall back to using the single-file index of all gems.
 
        --add-platform
-	      Add  a  new platform to the lockfile, re-resolving for the addi-
+	      Add a new platform to the lockfile, re-resolving for  the  addi-
 	      tion of that platform.
 
        --remove-platform
@@ -51,7 +51,7 @@ OPTIONS
 	      If updating, prefer updating to next major version (default).
 
        --strict
-	      If updating, do not allow any gem  to  be  updated  past	latest
+	      If  updating,  do  not  allow  any gem to be updated past latest
 	      --patch | --minor | --major.
 
        --conservative
@@ -59,28 +59,28 @@ OPTIONS
 	      do not allow shared dependencies to be updated.
 
 UPDATING ALL GEMS
-       If you run bundle lock with  --update  option  without  list  of  gems,
-       bundler	will  ignore  any  previously  installed  gems and resolve all
-       dependencies again based on the latest versions of all  gems  available
+       If  you	run  bundle  lock  with  --update option without list of gems,
+       bundler will ignore any	previously  installed  gems  and  resolve  all
+       dependencies  again  based on the latest versions of all gems available
        in the sources.
 
 UPDATING A LIST OF GEMS
        Sometimes, you want to update a single gem in the Gemfile(5), and leave
-       the rest of the gems that you specified locked to the versions  in  the
+       the  rest  of the gems that you specified locked to the versions in the
        Gemfile.lock.
 
-       For  instance,  you  only  want	to  update  nokogiri,  run bundle lock
+       For instance, you  only	want  to  update  nokogiri,  run  bundle  lock
        --update nokogiri.
 
        Bundler will update nokogiri and any of its dependencies, but leave the
-       rest  of the gems that you specified locked to the versions in the Gem-
+       rest of the gems that you specified locked to the versions in the  Gem-
        file.lock.
 
 SUPPORTING OTHER PLATFORMS
-       If you want your bundle to support platforms other than the one	you're
+       If  you want your bundle to support platforms other than the one you're
        running locally, you can run bundle lock --add-platform PLATFORM to add
-       PLATFORM to the lockfile, force bundler to re-resolve and consider  the
-       new  platform  when picking gems, all without needing to have a machine
+       PLATFORM  to the lockfile, force bundler to re-resolve and consider the
+       new platform when picking gems, all without needing to have  a  machine
        that matches PLATFORM handy to install those platform-specific gems on.
 
        For a full explanation of gem platforms, see gem help platform.
@@ -90,4 +90,4 @@ PATCH LEVEL OPTIONS
 
 
 
-				September 2019			BUNDLE-LOCK(1)
+				 November 2019			BUNDLE-LOCK(1)