Merge branch 'master' into nested_has_many_through

Conflicts:
	activerecord/CHANGELOG
	activerecord/lib/active_record/association_preload.rb
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/associations/class_methods/join_dependency.rb
	activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
	activerecord/lib/active_record/associations/has_many_association.rb
	activerecord/lib/active_record/associations/has_many_through_association.rb
	activerecord/lib/active_record/associations/has_one_association.rb
	activerecord/lib/active_record/associations/has_one_through_association.rb
	activerecord/lib/active_record/associations/through_association_scope.rb
	activerecord/lib/active_record/reflection.rb
	activerecord/test/cases/associations/has_many_through_associations_test.rb
	activerecord/test/cases/associations/has_one_through_associations_test.rb
	activerecord/test/cases/reflection_test.rb
	activerecord/test/cases/relations_test.rb
	activerecord/test/fixtures/memberships.yml
	activerecord/test/models/categorization.rb
	activerecord/test/models/category.rb
	activerecord/test/models/member.rb
	activerecord/test/models/reference.rb
	activerecord/test/models/tagging.rb

1 files changed, 2 insertions, 5 deletions

diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb
index aaa41f5ec6..2a1f51a9a7 100644
--- a/activemodel/lib/active_model/callbacks.rb
+++ b/activemodel/lib/active_model/callbacks.rb
@@ -24,14 +24,11 @@ module ActiveModel
   # you want callbacks on in a block so that the callbacks get a chance to fire:
   #
   #   def create
-  #     _run_create_callbacks do
+  #     run_callbacks :create do
   #       # Your create action methods here
   #     end
   #   end
   #
-  # The _run_<method_name>_callbacks methods are dynamically created when you extend
-  # the <tt>ActiveModel::Callbacks</tt> module.
-  #
   # Then in your class, you can use the +before_create+, +after_create+ and +around_create+
   # methods, just as you would in an Active Record module.
   #
@@ -102,7 +99,7 @@ module ActiveModel
         define_callbacks(callback, options)
 
         types.each do |type|
-          send(:"_define_#{type}_model_callback", self, callback)
+          send("_define_#{type}_model_callback", self, callback)
         end
       end
     end