Skip to content
Browse files

Merge remote branch 'docrails/master'

  • Loading branch information...
2 parents ddeaf6c + fc01ade commit b7c4523a94c8cbd13f183f4bce17db13143d45f1 @fxn fxn committed Aug 8, 2010
View
13 activerecord/lib/active_record/associations.rb
@@ -1593,15 +1593,12 @@ def add_touch_callbacks(reflection, touch_attribute)
# Creates before_destroy callback methods that nullify, delete or destroy
# has_many associated objects, according to the defined :dependent rule.
- # If the association is marked as :dependent => :restrict, create a callback
- # that prevents deleting entirely.
#
- # See HasManyAssociation#delete_records. Dependent associations
- # delete children, otherwise foreign key is set to NULL.
- # See HasManyAssociation#delete_records. Dependent associations
- # delete children if the option is set to :destroy or :delete_all, set the
- # foreign key to NULL if the option is set to :nullify, and do not touch the
- # child records if the option is set to :restrict.
+ # See HasManyAssociation#delete_records for more information. In general
+ # - delete children if the option is set to :destroy or :delete_all
+ # - set the foreign key to NULL if the option is set to :nullify
+ # - do not delete the parent record if there is any child record if the
+ # option is set to :restrict
#
# The +extra_conditions+ parameter, which is not used within the main
# Active Record codebase, is meant to allow plugins to define extra
View
2 activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
@@ -29,7 +29,7 @@ module ClassInheritableAttributes # :nodoc:
# To opt out of the instance reader method, pass :instance_reader => false.
#
# class Person
-# cattr_accessor :hair_colors :instance_writer => false, :instance_reader => false
+# class_inheritable_accessor :hair_colors :instance_writer => false, :instance_reader => false
# end
#
# Person.new.hair_colors = [:brown] # => NoMethodError

0 comments on commit b7c4523

Please sign in to comment.
Something went wrong with that request. Please try again.