From b0391d133af89b14f3318a448dfff27f41e572f2 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 23 Jun 2007 17:34:41 +0000 Subject: [PATCH] Docfix (closes #8674) git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7101 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/base.rb | 4 ++-- 1 file 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