aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/hash_with_indifferent_access.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-03-06 17:52:30 +0100
committerXavier Noria <fxn@hashref.com>2011-03-06 17:52:30 +0100
commit89d825d02172f7c1ba1211119ea9844206aae9c3 (patch)
tree4716db6c964db1b81843523932be4b097b9291db /activesupport/lib/active_support/hash_with_indifferent_access.rb
parent5e7ce47fb9ab50858fe067a6eb6c0462c5c5681e (diff)
parent6ce844a3c1d9c1de4ae54cbe73e0dbd0acbe688a (diff)
downloadrails-89d825d02172f7c1ba1211119ea9844206aae9c3.tar.gz
rails-89d825d02172f7c1ba1211119ea9844206aae9c3.tar.bz2
rails-89d825d02172f7c1ba1211119ea9844206aae9c3.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activesupport/lib/active_support/hash_with_indifferent_access.rb')
-rw-r--r--activesupport/lib/active_support/hash_with_indifferent_access.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/hash_with_indifferent_access.rb b/activesupport/lib/active_support/hash_with_indifferent_access.rb
index 6a344867ee..79a0de7940 100644
--- a/activesupport/lib/active_support/hash_with_indifferent_access.rb
+++ b/activesupport/lib/active_support/hash_with_indifferent_access.rb
@@ -1,7 +1,7 @@
require 'active_support/core_ext/hash/keys'
# This class has dubious semantics and we only have it so that
-# people can write params[:key] instead of params['key']
+# people can write <tt>params[:key]</tt> instead of <tt>params['key']</tt>
# and they get the same value for both keys.
module ActiveSupport
@@ -109,7 +109,7 @@ module ActiveSupport
end
# Performs the opposite of merge, with the keys and values from the first hash taking precedence over the second.
- # This overloaded definition prevents returning a regular hash, if reverse_merge is called on a HashWithDifferentAccess.
+ # This overloaded definition prevents returning a regular hash, if reverse_merge is called on a <tt>HashWithDifferentAccess</tt>.
def reverse_merge(other_hash)
super self.class.new_from_hash_copying_default(other_hash)
end