diff options
| author | Anton Cherepanov <davetoxa@gmail.com> | 2014-06-23 22:50:21 +0600 |
|---|---|---|
| committer | Anton Cherepanov <davetoxa@gmail.com> | 2014-06-23 23:15:58 +0600 |
| commit | e2960fb293840983ac99a8997b09b183b86b05c7 (patch) | |
| tree | 02d1b8c5baa5a74b859c5f1a0dda662cb41db2f9 /guides | |
| parent | 936fd4c1e017ec88699b3cd7daa09847da36c731 (diff) | |
| download | rails-e2960fb293840983ac99a8997b09b183b86b05c7.tar.gz rails-e2960fb293840983ac99a8997b09b183b86b05c7.tar.bz2 rails-e2960fb293840983ac99a8997b09b183b86b05c7.zip | |
Small typo
Diffstat (limited to 'guides')
| -rw-r--r-- | guides/source/layouts_and_rendering.md | 2 | ||||
| -rw-r--r-- | guides/source/upgrading_ruby_on_rails.md | 4 |
2 files changed, 3 insertions, 3 deletions
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: |