From 65145e3692533b6b41dae176457146e0fdfd406e Mon Sep 17 00:00:00 2001
From: Mike Gunderloy <MikeG1@larkfarm.com>
Date: Tue, 28 Oct 2008 06:16:27 -0500
Subject: Typo fix for AR Associations Guide

---
 railties/doc/guides/html/association_basics.html  | 2 +-
 railties/doc/guides/source/association_basics.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/doc')

diff --git a/railties/doc/guides/html/association_basics.html b/railties/doc/guides/html/association_basics.html
index 012a1a0156..96aae9c51a 100644
--- a/railties/doc/guides/html/association_basics.html
+++ b/railties/doc/guides/html/association_basics.html
@@ -691,7 +691,7 @@ http://www.gnu.org/software/src-highlite -->
   belongs_to <span style="color: #990000">:</span>manager<span style="color: #990000">,</span> <span style="color: #990000">:</span>class_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"User"</span>
 <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
 </tt></pre></div></div>
-<div class="para"><p>With this setup, you can retrieve <tt>@employee.subordinates</tt> and <tt>@employee.managers</tt>.</p></div>
+<div class="para"><p>With this setup, you can retrieve <tt>@employee.subordinates</tt> and <tt>@employee.manager</tt>.</p></div>
 </div>
 <h2 id="_tips_tricks_and_warnings">3. Tips, Tricks, and Warnings</h2>
 <div class="sectionbody">
diff --git a/railties/doc/guides/source/association_basics.txt b/railties/doc/guides/source/association_basics.txt
index 695b834652..7ab42dafbe 100644
--- a/railties/doc/guides/source/association_basics.txt
+++ b/railties/doc/guides/source/association_basics.txt
@@ -359,7 +359,7 @@ class Employee < ActiveRecord::Base
 end
 -------------------------------------------------------
 
-With this setup, you can retrieve +@employee.subordinates+ and +@employee.managers+.
+With this setup, you can retrieve +@employee.subordinates+ and +@employee.manager+.
 
 == Tips, Tricks, and Warnings
 
-- 
cgit v1.2.3