diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-07-09 12:20:24 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-07-09 12:20:24 +0200 |
| commit | b65bd01d555651e278099ec2fe5cf9c7db7608d9 (patch) | |
| tree | b275ac1809531f396e0edcb02776d849c81eff2f /activerecord/lib/active_record/associations | |
| parent | 6917c65f048b3b5d09ac80271b0c94eae0120f0c (diff) | |
| parent | 1835aba6f176950b3d5532895f90b8a92a23f476 (diff) | |
| download | rails-b65bd01d555651e278099ec2fe5cf9c7db7608d9.tar.gz rails-b65bd01d555651e278099ec2fe5cf9c7db7608d9.tar.bz2 rails-b65bd01d555651e278099ec2fe5cf9c7db7608d9.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_proxy.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb index 7f7dec467a..827dfb7ccb 100644 --- a/activerecord/lib/active_record/associations/collection_proxy.rb +++ b/activerecord/lib/active_record/associations/collection_proxy.rb @@ -12,7 +12,7 @@ module ActiveRecord # has_many :posts # end # - # blog = Blog.find(:first) + # blog = Blog.first # # the association proxy in <tt>blog.posts</tt> has the object in +blog+ as # <tt>@owner</tt>, the collection of its posts as <tt>@target</tt>, and |