From 69d395cbb244d63feae78d7dad33fa8b9e6ed17c Mon Sep 17 00:00:00 2001
From: Jonathan Garvin <jon@5valleys.com>
Date: Wed, 16 Jan 2013 20:22:23 -0700
Subject: fix example of setting DEFAULTS in fixtures

---
 activerecord/lib/active_record/fixtures.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 5a4ef5991d..2958d08210 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -363,11 +363,11 @@ module ActiveRecord
   #
   #   first:
   #     name: Smurf
-  #     *DEFAULTS
+  #     <<: *DEFAULTS
   #
   #   second:
   #     name: Fraggle
-  #     *DEFAULTS
+  #     <<: *DEFAULTS
   #
   # Any fixture labeled "DEFAULTS" is safely ignored.
   class FixtureSet
-- 
cgit v1.2.3


From 7bb34b12f09bdd94fe285caa18501aeffd1c64e6 Mon Sep 17 00:00:00 2001
From: Tatsuro Baba <harakirisoul@gmail.com>
Date: Fri, 18 Jan 2013 18:14:18 +0900
Subject: Remove useless number sign

I think that these signs are probably mistake.
---
 activerecord/lib/active_record/base.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index bf5793d454..e262401da6 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -162,8 +162,8 @@ module ActiveRecord #:nodoc:
   #
   # Dynamic attribute-based finders are a cleaner way of getting (and/or creating) objects
   # by simple queries without turning to SQL. They work by appending the name of an attribute
-  # to <tt>find_by_</tt> # like <tt>Person.find_by_user_name</tt>.
-  # Instead of writing # <tt>Person.where(user_name: user_name).first</tt>, you just do
+  # to <tt>find_by_</tt> like <tt>Person.find_by_user_name</tt>.
+  # Instead of writing <tt>Person.where(user_name: user_name).first</tt>, you just do
   # <tt>Person.find_by_user_name(user_name)</tt>.
   #
   # It's possible to add an exclamation point (!) on the end of the dynamic finders to get them to raise an
-- 
cgit v1.2.3


From cb413c77cdc55e085514d1a5d4b945761f40a7f9 Mon Sep 17 00:00:00 2001
From: Tatsuro Baba <harakirisoul@gmail.com>
Date: Tue, 22 Jan 2013 09:48:38 +0900
Subject: Fix typo

---
 activerecord/lib/active_record/associations.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 16a46a59d1..06bdabfced 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -191,7 +191,7 @@ module ActiveRecord
     # * <tt>Project#portfolio, Project#portfolio=(portfolio), Project#portfolio.nil?</tt>
     # * <tt>Project#project_manager, Project#project_manager=(project_manager), Project#project_manager.nil?,</tt>
     # * <tt>Project#milestones.empty?, Project#milestones.size, Project#milestones, Project#milestones<<(milestone),</tt>
-    #   <tt>Project#milestones.delete(milestone), Project#milestones.destroy(mileston), Project#milestones.find(milestone_id),</tt>
+    #   <tt>Project#milestones.delete(milestone), Project#milestones.destroy(milestone), Project#milestones.find(milestone_id),</tt>
     #   <tt>Project#milestones.build, Project#milestones.create</tt>
     # * <tt>Project#categories.empty?, Project#categories.size, Project#categories, Project#categories<<(category1),</tt>
     #   <tt>Project#categories.delete(category1), Project#categories.destroy(category1)</tt>
-- 
cgit v1.2.3