diff options
author | Xavier Noria <fxn@hashref.com> | 2010-11-23 21:59:50 +0100 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-11-23 21:59:50 +0100 |
commit | 85d64316a4b4205fa2490d05f62b25a63943f6ba (patch) | |
tree | 3807d93d7f34a90fd2d9b8d4062f4e1845104f8d /activerecord/lib | |
parent | 9f35799221c8a3c06b3f34a38525654b59598cfd (diff) | |
parent | fd64bba648762cfa6ffb603e0298502be873aa6f (diff) | |
download | rails-85d64316a4b4205fa2490d05f62b25a63943f6ba.tar.gz rails-85d64316a4b4205fa2490d05f62b25a63943f6ba.tar.bz2 rails-85d64316a4b4205fa2490d05f62b25a63943f6ba.zip |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/autosave_association.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/base.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/autosave_association.rb b/activerecord/lib/active_record/autosave_association.rb index cb5bc06580..73ac8e82c6 100644 --- a/activerecord/lib/active_record/autosave_association.rb +++ b/activerecord/lib/active_record/autosave_association.rb @@ -89,7 +89,7 @@ module ActiveRecord # post = Post.create(:title => 'ruby rocks') # post.comments.create(:body => 'hello world') # post.comments[0].body = 'hi everyone' - # post.save # => saves both post and comment, with 'hi everyone' as title + # post.save # => saves both post and comment, with 'hi everyone' as body # # Destroying one of the associated models as part of the parent's save action # is as simple as marking it for destruction: diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 18d30d2540..9e15784f61 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -852,7 +852,8 @@ module ActiveRecord #:nodoc: # limit(10) # Fires "SELECT * FROM posts LIMIT 10" # } # - # Assuming that <tt>published</tt> is a <tt>named_scope</tt> following two statements are same. + # It is recommended to use block form of unscoped because chaining unscoped with <tt>named_scope</tt> + # does not work. Assuming that <tt>published</tt> is a <tt>named_scope</tt> following two statements are same. # # Post.unscoped.published # Post.published |