Merge pull request #41 from sgerrand/master

Corrected foreign key parameter placement in the self join example

railties/guides/source/association_basics.textile

@@ -343,8 +343,8 @@ 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",
-    :foreign_key => "manager_id"
   belongs_to :manager, :class_name => "Employee"
+    :foreign_key => "manager_id"
 end
 </ruby>