Merge pull request #15880 from davetoxa/patch-1

s/overriden/overridden [ci skip]

activerecord/lib/active_record/attributes.rb

@@ -27,7 +27,7 @@ module ClassMethods
       #
       # ==== Examples
       #
-      # The type detected by Active Record can be overriden.
+      # The type detected by Active Record can be overridden.
       #
       #   # db/schema.rb
       #   create_table :store_listings, force: true do |t|

activerecord/lib/active_record/type/value.rb

@@ -63,7 +63,7 @@ def changed_in_place?(*) # :nodoc:
       private
       # Takes an input from the database, or from attribute setters,
       # and casts it to a type appropriate for this object. This method
-      # should not be overriden by subclasses. Instead, override `cast_value`.
+      # should not be overridden by subclasses. Instead, override `cast_value`.
       def type_cast(value) # :api: public
         cast_value(value) unless value.nil?
       end

guides/source/layouts_and_rendering.md

@@ -308,7 +308,7 @@ TIP: This option should be used only if you don't care about the content type of
 the response. Using `:plain` or `:html` might be more appropriate in most of the
 time.
 
-NOTE: Unless overriden, your response returned from this render option will be
+NOTE: Unless overridden, your response returned from this render option will be
 `text/html`, as that is the default content type of Action Dispatch response.
 
 #### Options for `render`

guides/source/upgrading_ruby_on_rails.md

@@ -315,10 +315,10 @@ authors.compact!
 
 ### Changes on Default Scopes
 
-Default scopes are no longer overriden by chained conditions.
+Default scopes are no longer overridden by chained conditions.
 
 In previous versions when you defined a `default_scope` in a model
-it was overriden by chained conditions in the same field. Now it
+it was overridden by chained conditions in the same field. Now it
 is merged like any other scope.
 
 Before: