diff options
| author | Gosha Arinich <me@goshakkk.name> | 2013-01-07 11:47:27 +0300 |
|---|---|---|
| committer | Gosha Arinich <me@goshakkk.name> | 2013-01-07 11:47:27 +0300 |
| commit | 0acf92184dab8d97db7d447bea8e3c6097b33722 (patch) | |
| tree | ee37ef9f2038a578ea789bdf64e10381e6da3697 /activerecord/lib | |
| parent | 09626e2ebaed9852a26b5572e3d27f4a154d6a05 (diff) | |
| download | rails-0acf92184dab8d97db7d447bea8e3c6097b33722.tar.gz rails-0acf92184dab8d97db7d447bea8e3c6097b33722.tar.bz2 rails-0acf92184dab8d97db7d447bea8e3c6097b33722.zip | |
prefer american spelling of 'behavior'
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_proxy.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index a12b38b08d..786873a047 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -951,7 +951,7 @@ module ActiveRecord # # The <tt>:dependent</tt> option can have different values which specify how the deletion # is done. For more information, see the documentation for this option on the different - # specific association types. When no option is given, the behaviour is to do nothing + # specific association types. When no option is given, the behavior is to do nothing # with the associated records when destroying a record. # # Note that <tt>:dependent</tt> is implemented using Rails' callback diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb index 7c43e37cf2..33dce58982 100644 --- a/activerecord/lib/active_record/associations/collection_proxy.rb +++ b/activerecord/lib/active_record/associations/collection_proxy.rb @@ -758,7 +758,7 @@ module ActiveRecord # person.pets.count # => 0 # person.pets.any? # => true # - # You can also pass a block to define criteria. The behaviour + # You can also pass a block to define criteria. The behavior # is the same, it returns true if the collection based on the # criteria is not empty. # @@ -793,7 +793,7 @@ module ActiveRecord # person.pets.many? #=> true # # You can also pass a block to define criteria. The - # behaviour is the same, it returns true if the collection + # behavior is the same, it returns true if the collection # based on the criteria has more than one record. # # person.pets |