diff options
author | Xavier Noria <fxn@hashref.com> | 2011-07-24 21:02:51 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-07-24 21:02:51 +0200 |
commit | 4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364 (patch) | |
tree | d2bd733be55a75d5aab8fbcfc4adbb83034980bc /activesupport/lib/active_support/deprecation/behaviors.rb | |
parent | 97716e6273018c5531c7c927d226af823a0a3820 (diff) | |
parent | 0626668374d092a3cf72b16fe24944beffddf804 (diff) | |
download | rails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.tar.gz rails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.tar.bz2 rails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.zip |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activesupport/lib/active_support/deprecation/behaviors.rb')
-rw-r--r-- | activesupport/lib/active_support/deprecation/behaviors.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/deprecation/behaviors.rb b/activesupport/lib/active_support/deprecation/behaviors.rb index da4af339fc..f9505a247c 100644 --- a/activesupport/lib/active_support/deprecation/behaviors.rb +++ b/activesupport/lib/active_support/deprecation/behaviors.rb @@ -7,12 +7,12 @@ module ActiveSupport # Whether to print a backtrace along with the warning. attr_accessor :debug - # Returns the set behaviour or if one isn't set, defaults to +:stderr+ + # Returns the set behavior or if one isn't set, defaults to +:stderr+ def behavior @behavior ||= [DEFAULT_BEHAVIORS[:stderr]] end - # Sets the behaviour to the specified value. Can be a single value or an array. + # Sets the behavior to the specified value. Can be a single value or an array. # # Examples # |