fix typo

CHANGELOG.md

@@ -179,7 +179,7 @@ _No changes._
 
 ### Fixed
 * Stop falling back to en locale when I18n is missing(@kryzhovnik [#2083](https://github.com/carrierwaveuploader/carrierwave/pull/2083))
-* Allow nagative timestamp in cache id(@NickOttrando [#2092](https://github.com/carrierwaveuploader/carrierwave/pull/2092))
+* Allow negative timestamp in cache id(@NickOttrando [#2092](https://github.com/carrierwaveuploader/carrierwave/pull/2092))
 * Avoid calling `file.url` twice(@lukeasrodgers [#2078](https://github.com/carrierwaveuploader/carrierwave/pull/2078))
 * Content Type being reset when moving cached file(@dweinand [#2117](https://github.com/carrierwaveuploader/carrierwave/pull/2117))
 
@@ -224,7 +224,7 @@ _No changes._
 * [BREAKING CHANGE] Allow non-ASCII filename by default (@shuhei [#1772](https://github.com/carrierwaveuploader/carrierwave/pull/1772))
 * [BREAKING CHANGE] `to_json` behavior changed when serializing an uploader (@jnicklas and @lisarutan [#1481](https://github.com/carrierwaveuploader/carrierwave/pull/1481))
 * Better error when the configured storage is unknown (@st0012 [#1779](https://github.com/carrierwaveuploader/carrierwave/pull/1779))
-* Allow to pass additionnal options to Rackspace `authenticated_url` (@duhast [#1722](https://github.com/carrierwaveuploader/carrierwave/pull/1722))
+* Allow to pass additional options to Rackspace `authenticated_url` (@duhast [#1722](https://github.com/carrierwaveuploader/carrierwave/pull/1722))
 * Reduced memory footprint (@schneems [#1652](https://github.com/carrierwaveuploader/carrierwave/pull/1652), @simonprev [#1706](https://github.com/carrierwaveuploader/carrierwave/pull/1706))
 * Improve Fog Loading (@plribeiro3000 [#1620](https://github.com/carrierwaveuploader/carrierwave/pull/1620), @eavgerinos)
 * All locales from `config.i18n.available_locales` are added to load_path (@printercu [#1521](https://github.com/carrierwaveuploader/carrierwave/pull/1521))

README.md

@@ -961,7 +961,7 @@ See the MiniMagick site for more details:
 
 https://github.com/minimagick/minimagick
 
-And the ImageMagick command line options for more for whats on offer:
+And the ImageMagick command line options for more for what's on offer:
 
 http://www.imagemagick.org/script/command-line-options.php
 

features/file_storage_overridden_filename.feature

@@ -1,7 +1,7 @@
-Feature: uploader with file storage and overriden filename
+Feature: uploader with file storage and overridden filename
   In order to be awesome
   As a developer using CarrierWave
-  I want to upload files to the filesystem with an overriden filename
+  I want to upload files to the filesystem with an overridden filename
 
   Background:
     Given an uploader class that uses the 'file' storage

features/versions_overridden_filename.feature

@@ -1,7 +1,7 @@
-Feature: uploader with file storage and overriden filename
+Feature: uploader with file storage and overridden filename
   In order to customize the filaname of uploaded files
   As a developer using CarrierWave
-  I want to upload files to the filesystem with an overriden filename and different verions
+  I want to upload files to the filesystem with an overridden filename and different versions
 
   Background:
     Given an uploader class that uses the 'file' storage

lib/carrierwave/processing/mini_magick.rb

@@ -88,7 +88,7 @@ module CarrierWave
     #
     # === Parameters
     #
-    # [format (#to_s)] an abreviation of the format
+    # [format (#to_s)] an abbreviation of the format
     #
     # === Yields
     #

lib/carrierwave/processing/rmagick.rb

@@ -109,7 +109,7 @@ module CarrierWave
     #
     # === Parameters
     #
-    # [format (#to_s)] an abreviation of the format
+    # [format (#to_s)] an abbreviation of the format
     #
     # === Yields
     #

lib/carrierwave/storage/file.rb

@@ -17,7 +17,7 @@ module CarrierWave
       #
       # By default, store!() uses copy_to(), which operates by copying the file
       # from the cache to the store, then deleting the file from the cache.
-      # If move_to_store() is overriden to return true, then store!() uses move_to(),
+      # If move_to_store() is overridden to return true, then store!() uses move_to(),
       # which simply moves the file from cache to store.  Useful for large files.
       #
       # === Parameters
@@ -110,7 +110,7 @@ module CarrierWave
 
       def clean_cache!(seconds)
         Dir.glob(::File.expand_path(::File.join(uploader.cache_dir, '*'), CarrierWave.root)).each do |dir|
-          # generate_cache_id returns key formated TIMEINT-PID(-COUNTER)-RND
+          # generate_cache_id returns key formatted TIMEINT-PID(-COUNTER)-RND
           time = dir.scan(/(\d+)-\d+-\d+(?:-\d+)?/).first.map(&:to_i)
           time = Time.at(*time)
           if time < (Time.now.utc - seconds)

lib/carrierwave/storage/fog.rb

@@ -146,7 +146,7 @@ module CarrierWave
           :key    => uploader.fog_directory,
           :public => uploader.fog_public
         ).files.all(:prefix => uploader.cache_dir).each do |file|
-          # generate_cache_id returns key formated TIMEINT-PID(-COUNTER)-RND
+          # generate_cache_id returns key formatted TIMEINT-PID(-COUNTER)-RND
           matched = file.key.match(/(\d+)-\d+-\d+(?:-\d+)?/)
           next unless matched
           time = Time.at(matched[1].to_i)
@@ -398,7 +398,7 @@ module CarrierWave
         end
 
         ##
-        # Return url to file, if avaliable
+        # Return url to file, if available
         #
         # === Returns
         #

lib/carrierwave/uploader/cache.rb

@@ -110,7 +110,7 @@ module CarrierWave
       #
       # By default, cache!() uses copy_to(), which operates by copying the file
       # to the cache, then deleting the original file.  If move_to_cache() is
-      # overriden to return true, then cache!() uses move_to(), which simply
+      # overridden to return true, then cache!() uses move_to(), which simply
       # moves the file to the cache.  Useful for large files.
       #
       # === Parameters

script/console

@@ -3,7 +3,7 @@
 irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
 
 libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
+# Perhaps use a console_lib to store any extra methods I may want available in the console
 # libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
 libs <<  " -r #{File.dirname(__FILE__) + '/../lib/carrierwave.rb'}"
 puts "Loading carrierwave gem"

spec/orm/activerecord_spec.rb

@@ -198,7 +198,7 @@ describe CarrierWave::ActiveRecord do
         expect(@event.image).to be_an_instance_of(@uploader)
       end
 
-      it "should write nothing to the database, to prevent overriden filenames to fail because of unassigned attributes" do
+      it "should write nothing to the database, to prevent overridden filenames to fail because of unassigned attributes" do
         expect(@event[:image]).to be_nil
       end
 
@@ -714,7 +714,7 @@ describe CarrierWave::ActiveRecord do
       end
     end
 
-    describe 'with an overriden filename' do
+    describe 'with an overridden filename' do
       before do
         @uploader.class_eval do
           def filename
@@ -1063,7 +1063,7 @@ describe CarrierWave::ActiveRecord do
         expect(@event.images[0]).to be_an_instance_of(@uploader)
       end
 
-      it "should write nothing to the database, to prevent overriden filenames to fail because of unassigned attributes" do
+      it "should write nothing to the database, to prevent overridden filenames to fail because of unassigned attributes" do
         expect(@event[:images]).to be_nil
       end
 
@@ -1510,7 +1510,7 @@ describe CarrierWave::ActiveRecord do
       end
     end
 
-    describe 'with an overriden filename' do
+    describe 'with an overridden filename' do
       before do
         @uploader.class_eval do
           def filename
@@ -1658,7 +1658,7 @@ describe CarrierWave::ActiveRecord do
       Event.mount_uploader(:image, @uploader)
     end
 
-    context 'when #reload is overriden in the model' do
+    context 'when #reload is overridden in the model' do
       before do
         Event.class_eval do
           def reload(*)
@@ -1687,7 +1687,7 @@ describe CarrierWave::ActiveRecord do
       expect(new_event.image.model).not_to eq @event
     end
 
-    context 'when #initialize_dup is overriden in the model' do
+    context 'when #initialize_dup is overridden in the model' do
       before do
         Event.class_eval do
           def initialize_dup(*)

spec/storage/fog_helper.rb

@@ -310,7 +310,7 @@ end
         expect(@directory.files.all(:prefix => 'uploads/tmp').size).to eq(0)
       end
 
-      it "should clear all files older than, by defaul, 24 hours in the default cache directory" do
+      it "should clear all files older than, by default, 24 hours in the default cache directory" do
         Timecop.freeze(today) do
           @uploader.clean_cached_files!
         end