Merge branch 'master' of github.com:lifo/docrails

5 files changed, 23 insertions, 3 deletions

diff --git a/activesupport/lib/active_support/core_ext/hash/slice.rb b/activesupport/lib/active_support/core_ext/hash/slice.rb
index fdeea4c148..b862b5ae2a 100644
--- a/activesupport/lib/active_support/core_ext/hash/slice.rb
+++ b/activesupport/lib/active_support/core_ext/hash/slice.rb
@@ -18,7 +18,7 @@ class Hash
   end
 
   # Replaces the hash with only the given keys.
-  # Returns a hash contained the removed key/value pairs
+  # Returns a hash containing the removed key/value pairs.
   #   {:a => 1, :b => 2, :c => 3, :d => 4}.slice!(:a, :b) # => {:c => 3, :d => 4}
   def slice!(*keys)
     keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
diff --git a/activesupport/lib/active_support/deprecation/behaviors.rb b/activesupport/lib/active_support/deprecation/behaviors.rb
index 73b6a42505..db28c4d510 100644
--- a/activesupport/lib/active_support/deprecation/behaviors.rb
+++ b/activesupport/lib/active_support/deprecation/behaviors.rb
@@ -11,7 +11,21 @@ module ActiveSupport
         @behavior ||= [DEFAULT_BEHAVIORS[:stderr]]
       end
 
-      # Sets the behavior to the specified value. Can be a single value or an array.
+      # Sets the behavior to the specified value. Can be a single value, array, or
+      # and object that responds to +call+.
+      #
+      # Available options:
+      #
+      # [+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
+      #
+      # 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: 
       #
@@ -24,6 +38,10 @@ module ActiveSupport
       #
       #   ActiveSupport::Deprecation.behavior = :stderr
       #   ActiveSupport::Deprecation.behavior = [:stderr, :log]
+      #   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
diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index 61876d89a9..4fcd32edf2 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -106,7 +106,7 @@ module ActiveSupport
     # a nicer looking title. +titleize+ is meant for creating pretty output. It is not
     # used in the Rails internals.
     #
-    # +titleize+ is also aliased as as +titlecase+.
+    # +titleize+ is also aliased as +titlecase+.
     #
     # Examples:
     #   "man from the boondocks".titleize   # => "Man From The Boondocks"
diff --git a/activesupport/lib/active_support/rescuable.rb b/activesupport/lib/active_support/rescuable.rb
index 85e84bc203..7aecdd11d3 100644
--- a/activesupport/lib/active_support/rescuable.rb
+++ b/activesupport/lib/active_support/rescuable.rb
@@ -48,6 +48,7 @@ module ActiveSupport
       #       end
       #   end
       #
+      # Exceptions raised inside exception handlers are not propagated up.
       def rescue_from(*klasses, &block)
         options = klasses.extract_options!
 
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index 0baf9e1914..65213fb752 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -204,6 +204,7 @@ module ActiveSupport
       @current_period = nil
     end
 
+    # Returns the offset of this time zone in seconds.
     def utc_offset
       if @utc_offset
         @utc_offset