aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2007-12-02 19:54:18 +0000
committerMarcel Molina <marcel@vernix.org>2007-12-02 19:54:18 +0000
commitc84c0437d788f8534db79e0921a64df57c29f345 (patch)
tree760524d7032cc0dd6c19e3cd0cb29b6475d48cd6 /activerecord
parent92f02adf407d6884ffea789b39f78f44b7fd3722 (diff)
downloadrails-c84c0437d788f8534db79e0921a64df57c29f345.tar.gz
rails-c84c0437d788f8534db79e0921a64df57c29f345.tar.bz2
rails-c84c0437d788f8534db79e0921a64df57c29f345.zip
Fix documentation typo introduced in [8250]. Closes #10339 [Henrik N]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8256 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG2
-rwxr-xr-xactiverecord/lib/active_record/validations.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index f2f79fd823..5192a57159 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,3 +1,5 @@
+* Fix documentation typo introduced in [8250]. Closes #10339 [Henrik N]
+
*2.0.0 [RC2]* (November 28th, 2007)
* Foxy fixtures: support single-table inheritance. #10234 [tom]
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index c6e6d24c91..0ee8f84c62 100755
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -596,7 +596,7 @@ module ActiveRecord
# attribute (that maps to a column). When the record is updated, the same check is made but disregarding the record itself.
#
# Because this check is performed outside the database there is still a chance that duplicate values
- # will be inserted in two parrallel transactions. To guarantee against this you should create a
+ # will be inserted in two parallel transactions. To guarantee against this you should create a
# unique index on the field. See +create_index+ for more information.
#
# Configuration options: