diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2016-02-07 07:14:50 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2016-02-07 07:14:50 +0000 |
| commit | bef16522db074307406db62af8f293a5da165447 (patch) | |
| tree | 7e7b2ca3cbff2cace3cf668d3725535fc00e5c6c /activesupport | |
| parent | 5b1f3e5b75b98af1c3e68811e6d5459cc08f495d (diff) | |
| parent | 87f060a7ee00fa87b1b90ecb831e9fcb6b2376a7 (diff) | |
| download | rails-bef16522db074307406db62af8f293a5da165447.tar.gz rails-bef16522db074307406db62af8f293a5da165447.tar.bz2 rails-bef16522db074307406db62af8f293a5da165447.zip | |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/deprecation/proxy_wrappers.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/deprecation/proxy_wrappers.rb b/activesupport/lib/active_support/deprecation/proxy_wrappers.rb index 6f0ad445fc..0cb2d4d22e 100644 --- a/activesupport/lib/active_support/deprecation/proxy_wrappers.rb +++ b/activesupport/lib/active_support/deprecation/proxy_wrappers.rb @@ -80,7 +80,7 @@ module ActiveSupport # example.old_request.to_s # # => DEPRECATION WARNING: @request is deprecated! Call request.to_s instead of # @request.to_s - # (Bactrace information…) + # (Backtrace information…) # "special_request" # # example.request.to_s @@ -118,7 +118,7 @@ module ActiveSupport # # PLANETS.map { |planet| planet.capitalize } # # => DEPRECATION WARNING: PLANETS is deprecated! Use PLANETS_POST_2006 instead. - # (Bactrace information…) + # (Backtrace information…) # ["Mercury", "Venus", "Earth", "Mars", "Jupiter", "Saturn", "Uranus", "Neptune"] class DeprecatedConstantProxy < DeprecationProxy def initialize(old_const, new_const, deprecator = ActiveSupport::Deprecation.instance) |