diff options
| author | Dan Pickett <dpickett@enlightsolutions.com> | 2011-04-29 19:18:10 -0400 |
|---|---|---|
| committer | Dan Pickett <dpickett@enlightsolutions.com> | 2011-04-29 19:18:10 -0400 |
| commit | 1efaed5af13f876833b3acd614e8d0116812f308 (patch) | |
| tree | 8b2dd01afee8b4bdcf976d6a082d9fb89b32d43e /activesupport/lib | |
| parent | 85c8d73642f03410b86ee842edcfe0eba1d4252c (diff) | |
| parent | 010dbf7a2fd30f8dabebb3f04fed22c661d6bf80 (diff) | |
| download | rails-1efaed5af13f876833b3acd614e8d0116812f308.tar.gz rails-1efaed5af13f876833b3acd614e8d0116812f308.tar.bz2 rails-1efaed5af13f876833b3acd614e8d0116812f308.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/deprecation/reporting.rb | 4 | ||||
| -rw-r--r-- | activesupport/lib/active_support/notifications/fanout.rb | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/activesupport/lib/active_support/deprecation/reporting.rb b/activesupport/lib/active_support/deprecation/reporting.rb index ced08b8783..5d7e241d1a 100644 --- a/activesupport/lib/active_support/deprecation/reporting.rb +++ b/activesupport/lib/active_support/deprecation/reporting.rb @@ -5,10 +5,8 @@ module ActiveSupport # Outputs a deprecation warning to the output configured by <tt>ActiveSupport::Deprecation.behavior</tt> # - # Example: - # # ActiveSupport::Deprecation.warn("something broke!") - # #=> "DEPRECATION WARNING: something broke! (called from your_code.rb:1)" + # # => "DEPRECATION WARNING: something broke! (called from your_code.rb:1)" def warn(message = nil, callstack = caller) return if silenced deprecation_message(callstack, message).tap do |m| diff --git a/activesupport/lib/active_support/notifications/fanout.rb b/activesupport/lib/active_support/notifications/fanout.rb index adc34f3286..a9aa5464e9 100644 --- a/activesupport/lib/active_support/notifications/fanout.rb +++ b/activesupport/lib/active_support/notifications/fanout.rb @@ -1,7 +1,7 @@ module ActiveSupport module Notifications - # This is a default queue implementation that ships with Notifications. It - # just pushes events to all registered log subscribers. + # This is a default queue implementation that ships with Notifications. + # It just pushes events to all registered log subscribers. class Fanout def initialize @subscribers = [] @@ -33,7 +33,7 @@ module ActiveSupport listeners_for(name).any? end - # This is a sync queue, so there is not waiting. + # This is a sync queue, so there is no waiting. def wait end |