diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-06-23 17:34:41 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-06-23 17:34:41 +0000 |
| commit | b0391d133af89b14f3318a448dfff27f41e572f2 (patch) | |
| tree | 018a63dbca0f7e49654cb6aaae06be614b98c8b0 /activerecord | |
| parent | 5715a9900ccc161ffde2f02bc256afd4b2e74cc8 (diff) | |
| download | rails-b0391d133af89b14f3318a448dfff27f41e572f2.tar.gz rails-b0391d133af89b14f3318a448dfff27f41e572f2.tar.bz2 rails-b0391d133af89b14f3318a448dfff27f41e572f2.zip | |
Docfix (closes #8674)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7101 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
| -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 |