diff options
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 2d3ad5a53b..527c2fef5a 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1335,8 +1335,8 @@ module ActiveRecord #:nodoc: # end # end # - # In nested scopings, all previous parameters are overwritten by inner rule - # except :conditions in :find, that are merged as hash. + # In nested scopings, all previous parameters are overwritten by the innermost rule, with the exception of + # :conditions and :include options in :find, which are merged. # # class Article < ActiveRecord::Base # def self.find_with_scope |