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 /activesupport/lib | |
| parent | 09626e2ebaed9852a26b5572e3d27f4a154d6a05 (diff) | |
| download | rails-0acf92184dab8d97db7d447bea8e3c6097b33722.tar.gz rails-0acf92184dab8d97db7d447bea8e3c6097b33722.tar.bz2 rails-0acf92184dab8d97db7d447bea8e3c6097b33722.zip | |
prefer american spelling of 'behavior'
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/array/conversions.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/json/encoding.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb index 64e9945ef5..430a35fbaf 100644 --- a/activesupport/lib/active_support/core_ext/array/conversions.rb +++ b/activesupport/lib/active_support/core_ext/array/conversions.rb @@ -8,7 +8,7 @@ class Array # Converts the array to a comma-separated sentence where the last element is # joined by the connector word. # - # You can pass the following options to change the default behaviour. If you + # You can pass the following options to change the default behavior. If you # pass an option key that doesn't exist in the list below, it will raise an # <tt>ArgumentError</tt>. # diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb index 832d1ce6d5..9bf1ea35b3 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -235,7 +235,7 @@ class BigDecimal # real value. # # Use <tt>ActiveSupport.use_standard_json_big_decimal_format = true</tt> to - # override this behaviour. + # override this behavior. def as_json(options = nil) #:nodoc: if finite? ActiveSupport.encode_big_decimal_as_string ? to_s : self |