diff options
| author | Marcel Molina <marcel@vernix.org> | 2005-12-20 03:26:17 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2005-12-20 03:26:17 +0000 |
| commit | 3c01e01ded4e8e87d48e844881c88f6e47cebdf0 (patch) | |
| tree | aa84b92ea2b01238d9b05fb32a4ad4cfee284eb4 | |
| parent | c61d27d0c730992d3e69e18d3a8b4e7a4dfeb56b (diff) | |
| download | rails-3c01e01ded4e8e87d48e844881c88f6e47cebdf0.tar.gz rails-3c01e01ded4e8e87d48e844881c88f6e47cebdf0.tar.bz2 rails-3c01e01ded4e8e87d48e844881c88f6e47cebdf0.zip | |
Fix typo in association docs. Closes #3296.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3320 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index de9e986861..27859d2a1d 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix typo in association docs. #3296. [Blair Zajac] + * Fixed :through relations when using STI inherited classes would use the inherited class's name as foreign key on the join model [Tobias Luetke] * MySQL: allow encoding option for mysql.rb driver. [Jeremy Kemper] diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 07dc28ddff..583f5f8044 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -125,7 +125,7 @@ module ActiveRecord # === Association extensions # # The proxy objects that controls the access to associations can be extended through anonymous modules. This is especially - # beneficial for adding new finders, creators, and other factory-type methods that are only used as part of this associatio. + # beneficial for adding new finders, creators, and other factory-type methods that are only used as part of this association. # Example: # # class Account < ActiveRecord::Base |