From 2156df13e08ff716463603730657bd321c03f8b4 Mon Sep 17 00:00:00 2001
From: Zoltan Kiss <kissx012@umn.edu>
Date: Fri, 14 Mar 2014 18:08:18 -0500
Subject: Minor grammer, code conventions fix [ci skip]

Conflicts:
	activesupport/lib/active_support/core_ext/hash/conversions.rb
---
 activesupport/lib/active_support/core_ext/hash/conversions.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'activesupport/lib/active_support/core_ext')

diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index 7bea461c77..6c3e48a3ca 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -105,7 +105,7 @@ class Hash
     #   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 @@ module ActiveSupport
 
   end
 end
-
-- 
cgit v1.2.3