diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2015-10-04 12:33:14 +0000 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2015-10-04 12:33:14 +0000 |
commit | 7976b6d3069d18aa4279921e15d90ef13197fd78 (patch) | |
tree | eed9a5c51c002f0864a2148b172c5238989e2eaa /activesupport/lib/active_support/deprecation | |
parent | 67597e1719ec6af7e22964603cc77aa5b085a864 (diff) | |
parent | e889a226fe8985a3403fea3e2f90ca75b52b8f17 (diff) | |
download | rails-7976b6d3069d18aa4279921e15d90ef13197fd78.tar.gz rails-7976b6d3069d18aa4279921e15d90ef13197fd78.tar.bz2 rails-7976b6d3069d18aa4279921e15d90ef13197fd78.zip |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'activesupport/lib/active_support/deprecation')
-rw-r--r-- | activesupport/lib/active_support/deprecation/proxy_wrappers.rb | 2 |
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 6572ff78a6..6f0ad445fc 100644 --- a/activesupport/lib/active_support/deprecation/proxy_wrappers.rb +++ b/activesupport/lib/active_support/deprecation/proxy_wrappers.rb @@ -111,7 +111,7 @@ module ActiveSupport # # PLANETS = %w(mercury venus earth mars jupiter saturn uranus neptune pluto) # - # (In a later update, the orignal implementation of `PLANETS` has been removed.) + # (In a later update, the original implementation of `PLANETS` has been removed.) # # PLANETS_POST_2006 = %w(mercury venus earth mars jupiter saturn uranus neptune) # PLANETS = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('PLANETS', 'PLANETS_POST_2006') |