aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
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 /activesupport
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 'activesupport')
-rw-r--r--activesupport/CHANGELOG.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 061f296dc5..cc45609cda 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -5,7 +5,7 @@
*Carlos Antonio da Silva*
-* Remove deprecated `Date#to_time_in_current_zone` in favour of `Date#in_time_zone`.
+* Remove deprecated `Date#to_time_in_current_zone` in favor of `Date#in_time_zone`.
*Vipul A M*