From 4ceac1a7cccc97a01ecf76dddf9aa7f880556b43 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Tue, 1 May 2012 19:14:42 +0530
Subject: [PATCH] copy edit AS deprecation/behaviours docs [ci skip]

---
 .../active_support/deprecation/behaviors.rb   | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/activesupport/lib/active_support/deprecation/behaviors.rb b/activesupport/lib/active_support/deprecation/behaviors.rb
index db28c4d510619..91025378105f6 100644
--- a/activesupport/lib/active_support/deprecation/behaviors.rb
+++ b/activesupport/lib/active_support/deprecation/behaviors.rb
@@ -6,42 +6,31 @@ class << self
       # Whether to print a backtrace along with the warning.
       attr_accessor :debug
 
-      # Returns the set behavior or if one isn't set, defaults to +:stderr+
+      # Returns the current behavior or if one isn't set, defaults to +:stderr+
       def behavior
         @behavior ||= [DEFAULT_BEHAVIORS[:stderr]]
       end
 
       # Sets the behavior to the specified value. Can be a single value, array, or
-      # and object that responds to +call+.
+      # an object that responds to +call+.
       #
-      # Available options:
+      # Available behaviors:
       #
-      # [+stderr+]  Log all deprecation warnings to $stderr
-      # [+log+]  Log all deprecation warnins to +Rails.logger+
-      # [+notify] Use +ActiveSupport::Notifications+ to notify of +deprecation.rails+.
-      # [+silence+] Do nothing
+      # [+stderr+]  Log all deprecation warnings to +$stderr+.
+      # [+log+]     Log all deprecation warnings to +Rails.logger+.
+      # [+notify]   Use +ActiveSupport::Notifications+ to notify +deprecation.rails+.
+      # [+silence+] Do nothing.
       #
-      # Note, setting behaviors only effects deprecations that happen afterwards.
-      # For example, All gems are required before Rails boots. Those gems may
-      # raise deprecation warnings according to the default setting. Setting
-      # behavior in a config file only effects code after boot time. So, the
-      # set behavior applies to deprecations raised at runtime.
-      #
-      # Available behaviors: 
-      #
-      # [+:stderr+] Print deprecations to +$stderror+
-      # [+:log+] Send to +Rails.logger+
-      # [+:notify+] Instrument using +ActiveSupport::Notifications+
-      # [+:silence+] Do nothing
-      #
-      # Examples
+      # Setting behaviors only affects deprecations that happen after boot time.
+      # Deprecation warnings raised by gems are not affected by this setting because
+      # they happen before Rails boots up.
       #
       #   ActiveSupport::Deprecation.behavior = :stderr
       #   ActiveSupport::Deprecation.behavior = [:stderr, :log]
+      #   ActiveSupport::Deprecation.behavior = MyCustomHandler
       #   ActiveSupport::Deprecation.behavior = proc { |message, callstack| 
       #     # custom stuff
       #   }
-      #   ActiveSupport::Deprecation.behavior = MyCustomHandler
       def behavior=(behavior)
         @behavior = Array(behavior).map { |b| DEFAULT_BEHAVIORS[b] || b }
       end