aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-12-08 23:11:37 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-12-08 23:11:37 +0530
commit0a33fcd68bb2c56b8c2eba066f343484a44fa588 (patch)
treed54d667ff16f99274fdec0edaf7df98bf8eba6ef /activesupport/lib/active_support
parent1233fc6de145932f3cd46c784ea78234cfa743b2 (diff)
parent729798068a54dbbe553c71f0283cb6ad74c2e77c (diff)
downloadrails-0a33fcd68bb2c56b8c2eba066f343484a44fa588.tar.gz
rails-0a33fcd68bb2c56b8c2eba066f343484a44fa588.tar.bz2
rails-0a33fcd68bb2c56b8c2eba066f343484a44fa588.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/deprecation/proxy_wrappers.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/deprecation/proxy_wrappers.rb b/activesupport/lib/active_support/deprecation/proxy_wrappers.rb
index 17e69c34a5..485dc91063 100644
--- a/activesupport/lib/active_support/deprecation/proxy_wrappers.rb
+++ b/activesupport/lib/active_support/deprecation/proxy_wrappers.rb
@@ -30,7 +30,7 @@ module ActiveSupport
# @old_object = DeprecatedObjectProxy.new(Object.new, "Don't use this object anymore!")
# @old_object = DeprecatedObjectProxy.new(Object.new, "Don't use this object anymore!", deprecator_instance)
#
- # When someone execute any method expect +inspect+ on proxy object this will
+ # When someone executes any method except +inspect+ on proxy object this will
# trigger +warn+ method on +deprecator_instance+.
#
# Default deprecator is <tt>ActiveSupport::Deprecation</tt>