diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-09 00:07:59 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-09 00:07:59 +0530 |
commit | 188d1d27876018c492280059b3d721be9afcc231 (patch) | |
tree | 20037458a5814681e78858c93eef14cc893ffe44 /activerecord/lib/active_record | |
parent | 085cb3b9af9d74fa9a3b72181f674f0b7c3dbf01 (diff) | |
parent | 97e7d43146b6edca19891d8c7ed6b4d93e7dad00 (diff) | |
download | rails-188d1d27876018c492280059b3d721be9afcc231.tar.gz rails-188d1d27876018c492280059b3d721be9afcc231.tar.bz2 rails-188d1d27876018c492280059b3d721be9afcc231.zip |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/associations.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 958821add6..b1a5110e2d 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1512,8 +1512,8 @@ module ActiveRecord # * <tt>Developer#projects.size</tt> # * <tt>Developer#projects.find(id)</tt> # * <tt>Developer#projects.exists?(...)</tt> - # * <tt>Developer#projects.build</tt> (similar to <tt>Project.new("project_id" => id)</tt>) - # * <tt>Developer#projects.create</tt> (similar to <tt>c = Project.new("project_id" => id); c.save; c</tt>) + # * <tt>Developer#projects.build</tt> (similar to <tt>Project.new("developer_id" => id)</tt>) + # * <tt>Developer#projects.create</tt> (similar to <tt>c = Project.new("developer_id" => id); c.save; c</tt>) # The declaration may include an options hash to specialize the behavior of the association. # # === Options |