Permalink
Browse files

Revert "Using American English spellings over British style spellings"

This reverts commit 573df1c.

Reason: changelog edits aren't allowed in docrails.

[ci skip]
  • Loading branch information...
vijaydev committed Mar 30, 2013
1 parent 6bd1bbe commit 06e22c01e86e47ebe0835e4c6ec351175cf91b96
Showing with 5 additions and 5 deletions.
  1. +3 −3 activesupport/CHANGELOG.md
  2. +2 −2 guides/source/upgrading_ruby_on_rails.md
@@ -74,7 +74,7 @@
* Improve `String#squish` to handle Unicode whitespace. *Antoine Lyset*
-* Standardize on `to_time` returning an instance of `Time` in the local system timezone
+* Standardise 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 behavior of the corresponding methods on the `Hash` class.
+ thus replicating the behaviour of the corresponding methods on the `Hash` class.
*Leo Cassarani*
@@ -93,7 +93,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 behavior. 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 behaviour. 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.
@@ -310,7 +310,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 JavaScript and CSS
+# Compress JavaScripts and CSS
config.assets.compress = true
# Don't fallback to assets pipeline if a precompiled asset is missed

0 comments on commit 06e22c0

Please sign in to comment.