Merge #7374

7374: Fix typos r=hsbt a=biow0lf

Fix typos

Co-authored-by: Igor Zubkov <igor.zubkov@ag-force.com>
(cherry picked from commit d4993be66fa2e76b3ca00ea56a51ecab5478b726)

3 files changed, 7 insertions, 7 deletions

diff --git a/UPGRADING.md b/UPGRADING.md
index 30d326795e..d11372dbb1 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -31,7 +31,7 @@ The CLI defines a set of commands and options that can be used by our users to
 create command lines that bundler can understand. There's a number of changes
 that we plan to make to this set of commands and options.
 
-* Flags passed to `bundle install` that relied on being remembered across invokations have been deprecated.
+* Flags passed to `bundle install` that relied on being remembered across invocations have been deprecated.
 
   In particular, the `--clean`, `--deployment`, `--frozen`, `--no-cache`,
   `--no-prune`, `--path`, `--shebang`, `--system`, `--without`, and `--with`
@@ -39,7 +39,7 @@ that we plan to make to this set of commands and options.
 
   Remembering CLI options has been a source of historical confusion and bug
   reports, not only for beginners but also for experienced users. A CLI tool
-  should not behave differently accross exactly the same invokations _unless_
+  should not behave differently across exactly the same invocations _unless_
   explicitly configured to do so. This is what configuration is about after all,
   and things should never be silently configured without the user knowing about
   it.
@@ -47,7 +47,7 @@ that we plan to make to this set of commands and options.
   The problem with changing this behavior is that very common workflows are
   relying on it. For example, when you run `bundle install --without
   development:test` in production, those flags are persisted in the app's
-  configuration file and further `bundle` invokations will happily ignore
+  configuration file and further `bundle` invocations will happily ignore
   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,
@@ -78,7 +78,7 @@ that we plan to make to this set of commands and options.
 * The `bundle console` will be removed and replaced with `bin/console`.
 
   Over time we found `bundle console` hard to maintain because every user would
-  want to add her own specific tweaks to it. In order to ease maintainance and
+  want to add her own specific tweaks to it. In order to ease maintenance and
   reduce bikeshedding discussions, we're removing the `bundle console` command
   in favor of a `bin/console` script created by `bundle gem` on gem generation
   that users can tweak to their needs.
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index f2735fb654..0083f7e7de 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -790,7 +790,7 @@ module Bundler
 
       Bundler::SharedHelpers.major_deprecation 2,\
         "The `#{flag_name}` flag is deprecated because it relies on being " \
-        "remembered accross bundler invokations, which bundler will no longer " \
+        "remembered across bundler invocations, which bundler will no longer " \
         "do in future versions. Instead please use `bundle config set #{name} " \
         "'#{value}'`, and stop using this flag"
     end
diff --git a/spec/other/major_deprecation_spec.rb b/spec/other/major_deprecation_spec.rb
index ec2cdbf99e..52fb532a4a 100644
--- a/spec/other/major_deprecation_spec.rb
+++ b/spec/other/major_deprecation_spec.rb
@@ -112,7 +112,7 @@ RSpec.describe "major deprecations" do
     it "should print a deprecation warning", :bundler => "2" do
       expect(deprecations).to include(
         "The `--path` flag is deprecated because it relies on being " \
-        "remembered accross bundler invokations, which bundler will no " \
+        "remembered across bundler invocations, which bundler will no " \
         "longer do in future versions. Instead please use `bundle config set " \
         "path 'vendor/bundle'`, and stop using this flag"
       )
@@ -314,7 +314,7 @@ RSpec.describe "major deprecations" do
         it "should print a deprecation warning", :bundler => "2" do
           expect(deprecations).to include(
             "The `#{flag_name}` flag is deprecated because it relies on " \
-            "being remembered accross bundler invokations, which bundler " \
+            "being remembered across bundler invocations, which bundler " \
             "will no longer do in future versions. Instead please use " \
             "`bundle config set #{name} '#{value}'`, and stop using this flag"
           )