Merge branch 'master' into active_model

Conflicts:
	activeresource/lib/active_resource/validations.rb

1 files changed, 4 insertions, 4 deletions

diff --git a/activesupport/lib/active_support/xml_mini/libxml.rb b/activesupport/lib/active_support/xml_mini/libxml.rb
index 3586b24a6b..370205409a 100644
--- a/activesupport/lib/active_support/xml_mini/libxml.rb
+++ b/activesupport/lib/active_support/xml_mini/libxml.rb
@@ -21,15 +21,15 @@ module ActiveSupport
   end
 end
 
-module LibXML
-  module Conversions
-    module Document
+module LibXML #:nodoc:
+  module Conversions #:nodoc:
+    module Document #:nodoc:
       def to_hash
         root.to_hash
       end
     end
 
-    module Node
+    module Node #:nodoc:
       CONTENT_ROOT = '__content__'
       LIB_XML_LIMIT = 30000000 # Hardcoded LibXML limit