diff options
| author | Zachary Scott <e@zzak.io> | 2014-06-23 10:23:11 -0700 |
|---|---|---|
| committer | Zachary Scott <e@zzak.io> | 2014-06-23 10:23:11 -0700 |
| commit | c73f97b0ee2464a400d8b3a892de65687e883d4a (patch) | |
| tree | 02d1b8c5baa5a74b859c5f1a0dda662cb41db2f9 | |
| parent | 936fd4c1e017ec88699b3cd7daa09847da36c731 (diff) | |
| parent | e2960fb293840983ac99a8997b09b183b86b05c7 (diff) | |
| download | rails-c73f97b0ee2464a400d8b3a892de65687e883d4a.tar.gz rails-c73f97b0ee2464a400d8b3a892de65687e883d4a.tar.bz2 rails-c73f97b0ee2464a400d8b3a892de65687e883d4a.zip | |
Merge pull request #15880 from davetoxa/patch-1
s/overriden/overridden [ci skip]
| -rw-r--r-- | activerecord/lib/active_record/attributes.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/type/value.rb | 2 | ||||
| -rw-r--r-- | guides/source/layouts_and_rendering.md | 2 | ||||
| -rw-r--r-- | guides/source/upgrading_ruby_on_rails.md | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/attributes.rb b/activerecord/lib/active_record/attributes.rb index d0287140c8..9a329ac564 100644 --- a/activerecord/lib/active_record/attributes.rb +++ b/activerecord/lib/active_record/attributes.rb @@ -27,7 +27,7 @@ module ActiveRecord # # ==== 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| diff --git a/activerecord/lib/active_record/type/value.rb b/activerecord/lib/active_record/type/value.rb index 875fb98c4b..063139e620 100644 --- a/activerecord/lib/active_record/type/value.rb +++ b/activerecord/lib/active_record/type/value.rb @@ -63,7 +63,7 @@ module ActiveRecord 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 diff --git a/guides/source/layouts_and_rendering.md b/guides/source/layouts_and_rendering.md index 5b75540c05..f00f7bca1b 100644 --- a/guides/source/layouts_and_rendering.md +++ b/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` diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md index d7dbfccb76..1876959e03 100644 --- a/guides/source/upgrading_ruby_on_rails.md +++ b/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: |