Merge remote branch 'mainstream/master'

Conflicts:
	activerecord/lib/active_record/base.rb
	railties/lib/rails/configuration.rb
	railties/lib/rails/log_subscriber.rb

1 files changed, 7 insertions, 4 deletions

diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index f7fb66bdfc..c1334069fa 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -21,7 +21,6 @@ module ActiveModel
   # A minimal implementation could be:
   # 
   #   class Person
-  #   
   #     include ActiveModel::AttributeMethods
   #     
   #     attribute_method_affix  :prefix => 'reset_', :suffix => '_to_default!'
@@ -44,9 +43,13 @@ module ActiveModel
   #     def reset_attribute_to_default!(attr)
   #       send("#{attr}=", "Default Name")
   #     end
-  #   
   #   end
-  # 
+  #
+  # Please notice that whenever you include ActiveModel::AtributeMethods in your class,
+  # it requires you to implement a <tt>attributes</tt> methods which returns a hash with
+  # each attribute name in your model as hash key and the attribute value as hash value.
+  # Hash keys must be a string.
+  #
   module AttributeMethods
     extend ActiveSupport::Concern
 
@@ -85,7 +88,7 @@ module ActiveModel
       #   AttributePerson.inheritance_column
       #   # => 'address_id'
       def define_attr_method(name, value=nil, &block)
-        sing = metaclass
+        sing = singleton_class
         sing.send :alias_method, "original_#{name}", name
         if block_given?
           sing.send :define_method, name, &block