From 3c01e01ded4e8e87d48e844881c88f6e47cebdf0 Mon Sep 17 00:00:00 2001
From: Marcel Molina <marcel@vernix.org>
Date: Tue, 20 Dec 2005 03:26:17 +0000
Subject: Fix typo in association docs. Closes #3296.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3320 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
activerecord/CHANGELOG | 2 ++
activerecord/lib/active_record/associations.rb | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
(limited to 'activerecord')
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
--
cgit v1.2.3