aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-07-03 11:52:52 +0200
committerYves Senn <yves.senn@gmail.com>2013-07-03 11:52:52 +0200
commit33c61e326525c0c46871de067eeb02ea1bc51da5 (patch)
tree8c04cb37fa1c8fca1acea5563b83f62dc81bd39a /guides
parentf775a8456a85a6ff838ed37de1aa7bcde9fc9c32 (diff)
downloadrails-33c61e326525c0c46871de067eeb02ea1bc51da5.tar.gz
rails-33c61e326525c0c46871de067eeb02ea1bc51da5.tar.bz2
rails-33c61e326525c0c46871de067eeb02ea1bc51da5.zip
use American English: "favor" not "favour" [ci skip]
according to http://guides.rubyonrails.org/api_documentation_guidelines.html#english
Diffstat (limited to 'guides')
-rw-r--r--guides/source/3_2_release_notes.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/guides/source/3_2_release_notes.md b/guides/source/3_2_release_notes.md
index e036860de2..dc4d942671 100644
--- a/guides/source/3_2_release_notes.md
+++ b/guides/source/3_2_release_notes.md
@@ -240,11 +240,11 @@ Action Pack
In the example above, Posts controller will no longer automatically look up for a posts layout. If you need this functionality you could either remove `layout "application"` from `ApplicationController` or explicitly set it to `nil` in `PostsController`.
-* Deprecated `ActionController::UnknownAction` in favour of `AbstractController::ActionNotFound`.
+* Deprecated `ActionController::UnknownAction` in favor of `AbstractController::ActionNotFound`.
-* Deprecated `ActionController::DoubleRenderError` in favour of `AbstractController::DoubleRenderError`.
+* Deprecated `ActionController::DoubleRenderError` in favor of `AbstractController::DoubleRenderError`.
-* Deprecated `method_missing` in favour of `action_missing` for missing actions.
+* Deprecated `method_missing` in favor of `action_missing` for missing actions.
* Deprecated `ActionController#rescue_action`, `ActionController#initialize_template_class` and `ActionController#assign_shortcuts`.