aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-05-01 11:16:31 +0200
committerXavier Noria <fxn@hashref.com>2011-05-01 11:16:31 +0200
commit2fbf302149cf40c791ca1207a5f984cf58903397 (patch)
tree5da770d0fd31520a6264a9864b1db1412646d100 /activesupport/lib/active_support
parenta0656989c47c29c87c4f243ce3695c39777c67b8 (diff)
parentb84b759ec60b5005fea183186639408fcf903450 (diff)
downloadrails-2fbf302149cf40c791ca1207a5f984cf58903397.tar.gz
rails-2fbf302149cf40c791ca1207a5f984cf58903397.tar.bz2
rails-2fbf302149cf40c791ca1207a5f984cf58903397.zip
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts: railties/guides/source/contributing_to_ruby_on_rails.textile
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/deprecation/reporting.rb4
-rw-r--r--activesupport/lib/active_support/notifications/fanout.rb6
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