aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/base.rb
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2011-10-14 22:21:40 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2011-10-14 22:21:40 +0530
commite759c8882a990606bb4aee8a643431ebe544c69f (patch)
treedea32e65055a6e67d89f106cf696ae7ef358619a /activerecord/lib/active_record/base.rb
parent521a089166a17d447c3b3b32ff7f9394774ca895 (diff)
parente2a3952428050ea8a22c6a7de27f30ee0b9b1d4d (diff)
downloadrails-e759c8882a990606bb4aee8a643431ebe544c69f.tar.gz
rails-e759c8882a990606bb4aee8a643431ebe544c69f.tar.bz2
rails-e759c8882a990606bb4aee8a643431ebe544c69f.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rw-r--r--activerecord/lib/active_record/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 6dae90266e..360e494af1 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -115,8 +115,8 @@ module ActiveRecord #:nodoc:
# When joining tables, nested hashes or keys written in the form 'table_name.column_name'
# can be used to qualify the table name of a particular condition. For instance:
#
- # Student.joins(:schools).where(:schools => { :type => 'public' })
- # Student.joins(:schools).where('schools.type' => 'public' )
+ # Student.joins(:schools).where(:schools => { :category => 'public' })
+ # Student.joins(:schools).where('schools.category' => 'public' )
#
# == Overwriting default accessors
#