Merge branch 'master' of git@github.com:lifo/docrails

1 files changed, 2 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index 73d9b36fc2..8481706074 100644
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -642,7 +642,7 @@ module ActiveRecord
       #
       # Using this validation method in conjunction with ActiveRecord::Base#save
       # does not guarantee the absence of duplicate record insertions, because
-      # uniqueness checks on the application level are inherently prone to racing
+      # uniqueness checks on the application level are inherently prone to race
       # conditions. For example, suppose that two users try to post a Comment at
       # the same time, and a Comment's title must be unique. At the database-level,
       # the actions performed by these users could be interleaved in the following manner:
@@ -685,7 +685,7 @@ module ActiveRecord
       #   do that efficiently), and thus not recommended.
       # - Creating a unique index on the field, by using
       #   ActiveRecord::ConnectionAdapters::SchemaStatements#add_index. In the
-      #   rare case that a racing condition occurs, the database will guarantee
+      #   rare case that a race condition occurs, the database will guarantee
       #   the field's uniqueness.
       #   
       #   When the database catches such a duplicate insertion,