Merge pull request #14394 from zoltankiss/fix_typo

Minor grammer, code conventions fix [ci skip]
This commit is contained in:
Arthur Neves 2014-03-15 12:12:49 -04:00
commit e3b12f6cb8

@ -105,7 +105,7 @@ class << self
# hash = Hash.from_xml(xml)
# # => {"hash"=>{"foo"=>1, "bar"=>2}}
#
# DisallowedType is raised if the XML contains attributes with <tt>type="yaml"</tt> or
# +DisallowedType+ is raised if the XML contains attributes with <tt>type="yaml"</tt> or
# <tt>type="symbol"</tt>. Use <tt>Hash.from_trusted_xml</tt> to parse this XML.
def from_xml(xml, disallowed_types = nil)
ActiveSupport::XMLConverter.new(xml, disallowed_types).to_h
@ -241,4 +241,3 @@ def process_array(value)
end
end