diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-10-06 23:16:13 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-10-06 23:16:13 +0200 |
| commit | db520042b3fbb94fd12f9f8c0458f6b2cd5187a9 (patch) | |
| tree | cb52db780575ee5c27eeed90721258d1fac55ada /activerecord/lib/active_record/serialization.rb | |
| parent | 2a04110f266b6ccaf94aeeae224af578a9620fbd (diff) | |
| parent | 3ca6988b782f7ae9da736b090fbf1edd8bc02fcb (diff) | |
| download | rails-db520042b3fbb94fd12f9f8c0458f6b2cd5187a9.tar.gz rails-db520042b3fbb94fd12f9f8c0458f6b2cd5187a9.tar.bz2 rails-db520042b3fbb94fd12f9f8c0458f6b2cd5187a9.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record/serialization.rb')
| -rw-r--r-- | activerecord/lib/active_record/serialization.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/serialization.rb b/activerecord/lib/active_record/serialization.rb index 398eb1534a..2bde06f562 100644 --- a/activerecord/lib/active_record/serialization.rb +++ b/activerecord/lib/active_record/serialization.rb @@ -22,7 +22,7 @@ module ActiveRecord #:nodoc: end private - # Add associations specified via the <tt>:includes</tt> option. + # Add associations specified via the <tt>:include</tt> option. # # Expects a block that takes as arguments: # +association+ - name of the association |