Merge branch 'master' of github.com:lifo/docrails

Conflicts:
	guides/source/active_record_validations.md

1 files changed, 3 insertions, 3 deletions

diff --git a/activesupport/lib/active_support/deprecation/instance_delegator.rb b/activesupport/lib/active_support/deprecation/instance_delegator.rb
index ff240cb887..8472a58add 100644
--- a/activesupport/lib/active_support/deprecation/instance_delegator.rb
+++ b/activesupport/lib/active_support/deprecation/instance_delegator.rb
@@ -3,13 +3,13 @@ require 'active_support/core_ext/module/delegation'
 
 module ActiveSupport
   class Deprecation
-    module InstanceDelegator
+    module InstanceDelegator # :nodoc:
       def self.included(base)
         base.extend(ClassMethods)
         base.public_class_method :new
       end
 
-      module ClassMethods
+      module ClassMethods # :nodoc:
         def include(included_module)
           included_module.instance_methods.each { |m| method_added(m) }
           super
@@ -21,4 +21,4 @@ module ActiveSupport
       end
     end
   end
-end
\ No newline at end of file
+end