aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-02-05 19:47:08 +0100
committerXavier Noria <fxn@hashref.com>2011-02-05 19:47:08 +0100
commit8b5dc9caa52a2877e3ecc207515fd156abad45e0 (patch)
tree1ce25206b88a7fb45ef6e37d1a7c293c31477c02 /activerecord/lib/active_record/associations.rb
parent59f7780a3454a14054d1d33d9b6e31192ab2e58b (diff)
parent277327bb7f389a140eb4ae7722d64d6cf45e06cf (diff)
downloadrails-8b5dc9caa52a2877e3ecc207515fd156abad45e0.tar.gz
rails-8b5dc9caa52a2877e3ecc207515fd156abad45e0.tar.bz2
rails-8b5dc9caa52a2877e3ecc207515fd156abad45e0.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
-rw-r--r--activerecord/lib/active_record/associations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index d30362b93e..398936b3d8 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -912,7 +912,7 @@ module ActiveRecord
# * <tt>Firm#clients.create</tt> (similar to <tt>c = Client.new("firm_id" => id); c.save; c</tt>)
# The declaration can also include an options hash to specialize the behavior of the association.
#
- # === Supported options
+ # === Options
# [:class_name]
# Specify the class name of the association. Use it only if that name can't be inferred
# from the association name. So <tt>has_many :products</tt> will by default be linked