From 573df1cf2a5d5d1f288c8a4a5d76194675141832 Mon Sep 17 00:00:00 2001 From: Prathamesh Sonpatki Date: Thu, 21 Mar 2013 20:41:45 +0530 Subject: Using American English spellings over British style spellings --- activesupport/CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'activesupport') diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 9d26b8ba3e..f5042ed170 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -74,7 +74,7 @@ * Improve `String#squish` to handle Unicode whitespace. *Antoine Lyset* -* Standardise on `to_time` returning an instance of `Time` in the local system timezone +* Standardize on `to_time` returning an instance of `Time` in the local system timezone across `String`, `Time`, `Date`, `DateTime` and `ActiveSupport::TimeWithZone`. *Andrew White* @@ -140,7 +140,7 @@ * Remove surrogate unicode character encoding from `ActiveSupport::JSON.encode` The encoding scheme was broken for unicode characters outside the basic multilingual plane; - since json is assumed to be UTF-8, and we already force the encoding to UTF-8, + since JSON is assumed to be UTF-8, and we already force the encoding to UTF-8, simply pass through the un-encoded characters. *Brett Carter* @@ -359,7 +359,7 @@ * An optional block can be passed to `HashWithIndifferentAccess#update` and `#merge`. The block will be invoked for each duplicated key, and used to resolve the conflict, - thus replicating the behaviour of the corresponding methods on the `Hash` class. + thus replicating the behavior of the corresponding methods on the `Hash` class. *Leo Cassarani* -- cgit v1.2.3