aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-05-13 13:24:42 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-05-13 13:24:42 -0700
commite7d5ba37f07ee8ff9daa3d80a81c8afc0b7148cc (patch)
tree76cd0d3876c92498612376a6c8111032a101937d
parent8a5b51e1e603f659c18117869b83488658e9684f (diff)
parent3f7ed52d3b0cdb31c355b142f9ac7526685a7049 (diff)
downloadrails-e7d5ba37f07ee8ff9daa3d80a81c8afc0b7148cc.tar.gz
rails-e7d5ba37f07ee8ff9daa3d80a81c8afc0b7148cc.tar.bz2
rails-e7d5ba37f07ee8ff9daa3d80a81c8afc0b7148cc.zip
Merge pull request #6306 from erichmenge/3-2-stable-guide-fix
3 2 stable guide fix [ci skip]
-rw-r--r--railties/guides/source/association_basics.textile4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/association_basics.textile b/railties/guides/source/association_basics.textile
index 6f0d985cac..ceb4862ff5 100644
--- a/railties/guides/source/association_basics.textile
+++ b/railties/guides/source/association_basics.textile
@@ -342,9 +342,9 @@ In designing a data model, you will sometimes find a model that should have a re
<ruby>
class Employee < ActiveRecord::Base
- has_many :subordinates, :class_name => "Employee"
- belongs_to :manager, :class_name => "Employee",
+ has_many :subordinates, :class_name => "Employee",
:foreign_key => "manager_id"
+ belongs_to :manager, :class_name => "Employee"
end
</ruby>