Auto merge of #5455 - googya:master, r=colby-swandale

fix typo

fix typo

8 files changed, 17 insertions, 17 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 633787a8ad..69a56af175 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@ Bugfixes:
 
 Bugfixes:
 
-  - fix the resolver attemting to activate ruby-platform gems when the bundle is only for other platforms (#5349, #5356, @segiddins)
+  - fix the resolver attempting to activate ruby-platform gems when the bundle is only for other platforms (#5349, #5356, @segiddins)
   - avoid re-resolving a locked gemfile that uses `gemspec` and includes development dependencies (#5349, @segiddins)
 
 ## 1.14.2 (2017-01-22)
@@ -144,7 +144,7 @@ Bugfixes:
 
   - allow `Settings` to be initialized without a root directory (@m1k3)
   - allow specifying ruby engines in the gemfile as a symbol (#4919, @JuanitoFatas)
-  - avoid an execption when using `bundler/deployment` with Vlad (@srbaker)
+  - avoid an exception when using `bundler/deployment` with Vlad (@srbaker)
   - ensure redefined methods have the same visibility as the one they're replacing, fixing `Kernel.require` failing on JRuby (#4975, @segiddins)
   - ensure that Bundler won't complain about a corrupt lockfile when no lockfile exists when using `gemspec` in the Gemfile (#5006, @segiddins)
   - fail gracefully when parsing the metadata for a gemspec from the compact index fails (@segiddins)
@@ -1380,13 +1380,13 @@ Bugfixes:
 
 Features:
 
-  - compatibile with Ruby 2.0.0-preview2
-  - compatibile with Rubygems 2.0.0.preview2 (@drbrain, @evanphx)
+  - compatible with Ruby 2.0.0-preview2
+  - compatible with Rubygems 2.0.0.preview2 (@drbrain, @evanphx)
   - ruby 2.0 added to the `:ruby19` ABI-compatible platform
   - lazy load YAML, allowing Psych to be specified in the Gemfile
   - significant performance improvements (@cheald, #2181)
   - `inject` command for scripted Gemfile additions (Engine Yard)
-  - :github option uses slashless arguements as repo owner (@rking)
+  - :github option uses slashless arguments as repo owner (@rking)
   - `open` suggests gem names for typos (@jdelStrother)
   - `update` reports non-existent gems (@jdelStrother)
   - `gem` option --test can generate rspec stubs (@MafcoCinco)
@@ -1810,7 +1810,7 @@ Features:
   - Add bundle clean. Removes unused gems from --path directory
   - Initial Gemcutter Endpoint API work, BAI Fetching source index
   - Added bundle install --standalone
-  - Ignore Gemfile.lock when buliding new gems
+  - Ignore Gemfile.lock when building new gems
   - Make it possible to override a .gemspec dependency's source in the
     Gemfile
 
@@ -1861,7 +1861,7 @@ Bugfixes:
 
 Features:
 
-  - Compatability with Rubygems 1.8.10 installer changes
+  - Compatibility with Rubygems 1.8.10 installer changes
   - Report gem installation failures clearly (@rwilcox, #1380)
   - Useful error for cap and vlad on first deploy (@nexmat, @kirs)
 
@@ -2611,7 +2611,7 @@ Bugfixes:
   - make the tests platform agnostic so we can confirm that they're green on JRuby
   - fixes for Ruby 1.9
 
-## 0.9.5 (Feburary 12, 2010)
+## 0.9.5 (February 12, 2010)
 
 Features:
 
diff --git a/lib/bundler/errors.rb b/lib/bundler/errors.rb
index 9ef1286936..6ce8493ea7 100644
--- a/lib/bundler/errors.rb
+++ b/lib/bundler/errors.rb
@@ -138,7 +138,7 @@ module Bundler
   class NoSpaceOnDeviceError < PermissionError
     def message
       "There was an error while trying to #{action} `#{@path}`. " \
-      "There was insufficent space remaining on the device."
+      "There was insufficient space remaining on the device."
     end
 
     status_code(31)
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index 4aa337a073..cbfdddeaf7 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -49,7 +49,7 @@ module Bundler
     # Bundler returns a warning message stating so and this method returns.
     #
     # Fourthly, Bundler checks if the default lockfile (Gemfile.lock) exists, and if so
-    # then proceeds to set up a defintion based on the default gemfile (Gemfile) and the
+    # then proceeds to set up a definition based on the default gemfile (Gemfile) and the
     # default lock file (Gemfile.lock). However, this is not the case if the platform is different
     # to that which is specified in Gemfile.lock, or if there are any missing specs for the gems.
     #
diff --git a/lib/bundler/setup.rb b/lib/bundler/setup.rb
index 4e213beed3..eb816b9988 100644
--- a/lib/bundler/setup.rb
+++ b/lib/bundler/setup.rb
@@ -22,7 +22,7 @@ if Bundler::SharedHelpers.in_bundle?
 
   unless ENV["BUNDLE_POSTIT_TRAMPOLINING_VERSION"]
     # Add bundler to the load path after disabling system gems
-    # This is guarenteed to be done already if we've trampolined
+    # This is guaranteed to be done already if we've trampolined
     bundler_lib = File.expand_path("../..", __FILE__)
     $LOAD_PATH.unshift(bundler_lib) unless $LOAD_PATH.include?(bundler_lib)
   end
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
index 44b9136c0b..0d68c85831 100644
--- a/lib/bundler/shared_helpers.rb
+++ b/lib/bundler/shared_helpers.rb
@@ -246,7 +246,7 @@ module Bundler
     def deprecate_gemfile(gemfile)
       return unless gemfile && File.basename(gemfile) == "Gemfile"
       Bundler::SharedHelpers.major_deprecation \
-        "gems.rb and gems.locked will be prefered to Gemfile and Gemfile.lock."
+        "gems.rb and gems.locked will be preferred to Gemfile and Gemfile.lock."
     end
 
     extend self
diff --git a/spec/bundler/plugin/index_spec.rb b/spec/bundler/plugin/index_spec.rb
index 23b2a89880..24b9a408ff 100644
--- a/spec/bundler/plugin/index_spec.rb
+++ b/spec/bundler/plugin/index_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe Bundler::Plugin::Index do
       expect(new_index.plugin_path(plugin_name)).to eq(lib_path(plugin_name))
     end
 
-    it "load_paths are persistant" do
+    it "load_paths are persistent" do
       new_index = Index.new
       expect(new_index.load_paths(plugin_name)).to eq([lib_path(plugin_name).join("lib").to_s])
     end
@@ -95,7 +95,7 @@ RSpec.describe Bundler::Plugin::Index do
         allow(File).to receive(:open).and_yield(file)
       end
 
-      it "should not save it with next registed hook" do
+      it "should not save it with next registered hook" do
         expect(file).to receive(:puts) do |content|
           expect(content).not_to include("not-there")
         end
diff --git a/spec/other/major_deprecation_spec.rb b/spec/other/major_deprecation_spec.rb
index 1ef17bfa1a..465d769538 100644
--- a/spec/other/major_deprecation_spec.rb
+++ b/spec/other/major_deprecation_spec.rb
@@ -120,7 +120,7 @@ RSpec.describe "major deprecations" do
         gem "rack"
       G
 
-      expect(warnings).to have_major_deprecation("gems.rb and gems.locked will be prefered to Gemfile and Gemfile.lock.")
+      expect(warnings).to have_major_deprecation("gems.rb and gems.locked will be preferred to Gemfile and Gemfile.lock.")
     end
 
     context "with flags" do
@@ -154,7 +154,7 @@ RSpec.describe "major deprecations" do
         Bundler.setup
       RUBY
 
-      expect(warnings).to have_major_deprecation("gems.rb and gems.locked will be prefered to Gemfile and Gemfile.lock.")
+      expect(warnings).to have_major_deprecation("gems.rb and gems.locked will be preferred to Gemfile and Gemfile.lock.")
     end
   end
 
diff --git a/spec/runtime/require_spec.rb b/spec/runtime/require_spec.rb
index 97248e2ce4..2d8935d2af 100644
--- a/spec/runtime/require_spec.rb
+++ b/spec/runtime/require_spec.rb
@@ -196,7 +196,7 @@ RSpec.describe "Bundler.require" do
       expect(err).to lack_errors
     end
 
-    it "does not mangle explictly given requires" do
+    it "does not mangle explicitly given requires" do
       gemfile <<-G
         path "#{lib_path}"
         gem 'jquery-rails', :require => 'jquery-rails'