aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/validations.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-07-28 09:00:33 +0200
committerJosé Valim <jose.valim@gmail.com>2009-07-28 09:00:33 +0200
commitd9aae2b56e64a4f417eaffa99e10cca274e928e7 (patch)
tree8438f6f784df9b252c0f834bc7cb9c369103d4cd /activerecord/lib/active_record/validations.rb
parent5025ae610f89989f3e15241ec7065e3d443614d9 (diff)
parent9533e0eca76b1df68a90e1ebe395d7b6a59d8e91 (diff)
downloadrails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.tar.gz
rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.tar.bz2
rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activerecord/lib/active_record/validations.rb')
-rw-r--r--activerecord/lib/active_record/validations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index 7ac6f6fe3b..a7fa98756e 100644
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -63,7 +63,7 @@ module ActiveRecord
# default message (e.g. <tt>activerecord.errors.messages.MESSAGE</tt>). The translated model name,
# translated attribute name and the value are available for interpolation.
#
- # When using inheritence in your models, it will check all the inherited models too, but only if the model itself
+ # When using inheritance in your models, it will check all the inherited models too, but only if the model itself
# hasn't been found. Say you have <tt>class Admin < User; end</tt> and you wanted the translation for the <tt>:blank</tt>
# error +message+ for the <tt>title</tt> +attribute+, it looks for these translations:
#