aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-12-05 10:33:50 +0100
committerXavier Noria <fxn@hashref.com>2010-12-05 10:33:50 +0100
commit48386d245bc169d3a36e5f305927bd968b108fea (patch)
tree9156d3535c42e7f56af6e69fbbd5164ccb4fcc95 /activemodel
parentb696dd70db651c6cb4a096dd0d5762416acd9917 (diff)
parente1d0d5ae81d2b02eebb1afbfb79edf0a2da2d48e (diff)
downloadrails-48386d245bc169d3a36e5f305927bd968b108fea.tar.gz
rails-48386d245bc169d3a36e5f305927bd968b108fea.tar.bz2
rails-48386d245bc169d3a36e5f305927bd968b108fea.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/lib/active_model/attribute_methods.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index c1c5640616..fc5f5c4c66 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -46,8 +46,8 @@ module ActiveModel
# end
# end
#
- # Notice that whenever you include ActiveModel::AttributeMethods in your class,
- # it requires you to implement a <tt>attributes</tt> methods which returns a hash
+ # Note that whenever you include ActiveModel::AttributeMethods in your class,
+ # it requires you to implement an <tt>attributes</tt> method which returns a hash
# with each attribute name in your model as hash key and the attribute value as
# hash value.
#