diff options
author | Dave Powers <djpowers@users.noreply.github.com> | 2014-11-11 13:06:53 -0500 |
---|---|---|
committer | Dave Powers <djpowers@users.noreply.github.com> | 2014-11-11 13:06:53 -0500 |
commit | 4223fa70f978af3d18af1b4301013a68a776a498 (patch) | |
tree | dcd3a22f6dd8373cf19a2b9517e8fda21a47fa2b | |
parent | d99f96452277f53a6434bc81f7a9539daecba5a9 (diff) | |
download | rails-4223fa70f978af3d18af1b4301013a68a776a498.tar.gz rails-4223fa70f978af3d18af1b4301013a68a776a498.tar.bz2 rails-4223fa70f978af3d18af1b4301013a68a776a498.zip |
Replace "behaviour" with "behavior"
Update to consistently use American English [ci skip]
-rw-r--r-- | guides/source/upgrading_ruby_on_rails.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md index 25759a0c77..6f5dea45b5 100644 --- a/guides/source/upgrading_ruby_on_rails.md +++ b/guides/source/upgrading_ruby_on_rails.md @@ -421,7 +421,7 @@ class ReadOnlyModel < ActiveRecord::Base end ``` -This behaviour was never intentionally supported. Due to a change in the internals +This behavior was never intentionally supported. Due to a change in the internals of `ActiveSupport::Callbacks`, this is no longer allowed in Rails 4.1. Using a `return` statement in an inline callback block causes a `LocalJumpError` to be raised when the callback is executed. @@ -795,7 +795,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. |