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

Conflicts:
	activemodel/lib/active_model/secure_password.rb
	activerecord/lib/active_record/associations/collection_proxy.rb

1 files changed, 4 insertions, 4 deletions

diff --git a/activemodel/lib/active_model/mass_assignment_security/sanitizer.rb b/activemodel/lib/active_model/mass_assignment_security/sanitizer.rb
index 44ce5a489d..dafb7cdff3 100644
--- a/activemodel/lib/active_model/mass_assignment_security/sanitizer.rb
+++ b/activemodel/lib/active_model/mass_assignment_security/sanitizer.rb
@@ -1,6 +1,6 @@
 module ActiveModel
   module MassAssignmentSecurity
-    class Sanitizer
+    class Sanitizer #:nodoc:
       # Returns all attributes not denied by the authorizer.
       def sanitize(klass, attributes, authorizer)
         rejected = []
@@ -18,7 +18,7 @@ module ActiveModel
       end
     end
 
-    class LoggerSanitizer < Sanitizer
+    class LoggerSanitizer < Sanitizer #:nodoc:
       def initialize(target)
         @target = target
         super()
@@ -50,7 +50,7 @@ module ActiveModel
       end
     end
 
-    class StrictSanitizer < Sanitizer
+    class StrictSanitizer < Sanitizer #:nodoc:
       def initialize(target = nil)
         super()
       end
@@ -65,7 +65,7 @@ module ActiveModel
       end
     end
 
-    class Error < StandardError
+    class Error < StandardError #:nodoc:
       def initialize(klass, attrs)
         super("Can't mass-assign protected attributes for #{klass.name}: #{attrs.join(', ')}")
       end