aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/errors.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-31 21:05:07 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-31 21:05:07 -0200
commitec466998387453203444f4c6a24eb92eb204d27a (patch)
tree99cbabe125ce34530ca4bb8c4f5578b3cbf7a65b /activemodel/lib/active_model/errors.rb
parent13c18fe2cab630798bd8f7946bc2646f0d295c7f (diff)
parentb5fdeaac557925830210d26b00f30dccfa802127 (diff)
downloadrails-ec466998387453203444f4c6a24eb92eb204d27a.tar.gz
rails-ec466998387453203444f4c6a24eb92eb204d27a.tar.bz2
rails-ec466998387453203444f4c6a24eb92eb204d27a.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'activemodel/lib/active_model/errors.rb')
-rw-r--r--activemodel/lib/active_model/errors.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb
index cf7551e4f4..97fd22f401 100644
--- a/activemodel/lib/active_model/errors.rb
+++ b/activemodel/lib/active_model/errors.rb
@@ -7,7 +7,7 @@ module ActiveModel
# == Active \Model \Errors
#
# Provides a modified +Hash+ that you can include in your object
- # for handling error messages and interacting with Action Pack helpers.
+ # for handling error messages and interacting with Action View helpers.
#
# A minimal implementation could be:
#
@@ -279,7 +279,7 @@ module ActiveModel
# If +message+ is a proc, it will be called, allowing for things like
# <tt>Time.now</tt> to be used within an error.
#
- # If the <tt>:strict</tt> option is set to true will raise
+ # If the <tt>:strict</tt> option is set to +true+, it will raise
# ActiveModel::StrictValidationFailed instead of adding the error.
# <tt>:strict</tt> option can also be set to any other exception.
#