docs, Associations also raise on name conflicts. [ci skip]

Follow up to 580f0b6#commitcomment-5293470
rails · Feb 6, 2014 · 7f648bc · 7f648bc
1 parent 580f0b6
commit 7f648bc
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/guides/source/4_1_release_notes.md b/guides/source/4_1_release_notes.md
@@ -525,8 +525,9 @@ for detailed changes.
   return an `Enumerator` that can calculate its
   size. ([Pull Request](https://github.com/rails/rails/pull/13938))
 
-* `scope` and `endum` now raise on "dangerous" name
-  conflicts. ([Pull Request](https://github.com/rails/rails/pull/13450))
+* `scope`, `enum` and Associations now raise on "dangerous" name
+  conflicts. ([Pull Request](https://github.com/rails/rails/pull/13450),
+  [Pull Request](https://github.com/rails/rails/pull/13896))
 
 * `second` through `fifth` methods act like the `first`
   finder. ([Pull Request](https://github.com/rails/rails/pull/13757))