aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorMikhail Dieterle <MikDiet@gmail.com>2014-02-22 21:57:11 +0300
committerMikhail Dieterle <MikDiet@gmail.com>2014-02-22 21:57:11 +0300
commit4b95405818fee8a07ff0995229eed7d759422dc4 (patch)
tree7756dac50d3b43a40a3ef2ead5ce5d4723158be0 /guides
parentb078f5ed843f23c61412ab21a94613377c9ad052 (diff)
downloadrails-4b95405818fee8a07ff0995229eed7d759422dc4.tar.gz
rails-4b95405818fee8a07ff0995229eed7d759422dc4.tar.bz2
rails-4b95405818fee8a07ff0995229eed7d759422dc4.zip
typos fixes
Diffstat (limited to 'guides')
-rw-r--r--guides/source/4_1_release_notes.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/guides/source/4_1_release_notes.md b/guides/source/4_1_release_notes.md
index a859553b1b..69ac442c9d 100644
--- a/guides/source/4_1_release_notes.md
+++ b/guides/source/4_1_release_notes.md
@@ -457,10 +457,10 @@ for detailed changes.
### Notable changes
-* Default scopes are no longer overriden by chained conditions.
+* Default scopes are no longer overridden by chained conditions.
Before this change 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. [More Details](upgrading_ruby_on_rails.html#changes-on-default-scopes).
* Added `ActiveRecord::Base.to_param` for convenient "pretty" URLs derived from
@@ -547,10 +547,10 @@ for detailed changes.
3.8.0`. ([Pull Request](https://github.com/rails/rails/pull/13350))
* Make `change_column_null`
- revertable. ([Commit](https://github.com/rails/rails/commit/724509a9d5322ff502aefa90dd282ba33a281a96))
+ revertible. ([Commit](https://github.com/rails/rails/commit/724509a9d5322ff502aefa90dd282ba33a281a96))
* Added a flag to disable schema dump after migration. This is set to `false`
- by defualt in the production environment for new applications. ([Pull Request](https://github.com/rails/rails/pull/13948))
+ by default in the production environment for new applications. ([Pull Request](https://github.com/rails/rails/pull/13948))
Active Model