diff options
| author | Prathamesh Sonpatki <csonpatki@gmail.com> | 2013-03-21 20:41:45 +0530 |
|---|---|---|
| committer | Prathamesh Sonpatki <csonpatki@gmail.com> | 2013-03-21 20:41:45 +0530 |
| commit | 573df1cf2a5d5d1f288c8a4a5d76194675141832 (patch) | |
| tree | e11ca720fd02a639c5d452125f61e91fb05176b1 | |
| parent | b9b8b240098eec098904cf084f751f8bf8cc7bcc (diff) | |
| download | rails-573df1cf2a5d5d1f288c8a4a5d76194675141832.tar.gz rails-573df1cf2a5d5d1f288c8a4a5d76194675141832.tar.bz2 rails-573df1cf2a5d5d1f288c8a4a5d76194675141832.zip | |
Using American English spellings over British style spellings
| -rw-r--r-- | activesupport/CHANGELOG.md | 6 | ||||
| -rw-r--r-- | guides/source/upgrading_ruby_on_rails.md | 4 |
2 files changed, 5 insertions, 5 deletions
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* diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md index cb43781f52..535d536dea 100644 --- a/guides/source/upgrading_ruby_on_rails.md +++ b/guides/source/upgrading_ruby_on_rails.md @@ -67,7 +67,7 @@ Rails 4.0 extracted Active Resource to its own gem. If you still need the featur * Rails 4.0 has changed how errors attach with the `ActiveModel::Validations::ConfirmationValidator`. Now when confirmation validations fail, the error will be attached to `:#{attribute}_confirmation` instead of `attribute`. -* Rails 4.0 has changed `ActiveModel::Serializers::JSON.include_root_in_json` default value to `false`. Now, Active Model Serializers and Active Record objects have the same default behaviour. This means that you can comment or remove the following option in the `config/initializers/wrap_parameters.rb` file: +* Rails 4.0 has changed `ActiveModel::Serializers::JSON.include_root_in_json` default value to `false`. Now, Active Model Serializers and Active Record objects have the same default behavior. This means that you can comment or remove the following option in the `config/initializers/wrap_parameters.rb` file: ```ruby # Disable root element in JSON by default. @@ -284,7 +284,7 @@ config.assets.debug = true Again, most of the changes below are for the asset pipeline. You can read more about these in the [Asset Pipeline](asset_pipeline.html) guide. ```ruby -# Compress JavaScripts and CSS +# Compress JavaScript and CSS config.assets.compress = true # Don't fallback to assets pipeline if a precompiled asset is missed |