aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/attribute_methods.rb
diff options
context:
space:
mode:
authorDmitry Polushkin <dmitry.polushkin@gmail.com>2011-10-05 17:35:59 +0100
committerDmitry Polushkin <dmitry.polushkin@gmail.com>2011-10-05 17:35:59 +0100
commit84eece0a823e9c601ea99a8709f24605a19bcbfd (patch)
tree12ac66c6404f35faddd06617987ad6db76b11406 /activemodel/lib/active_model/attribute_methods.rb
parent19965402b2f868c79d78269ca17cb6282f271382 (diff)
parentc495bfc127405f7ead0d1c275c4d75682a51e00e (diff)
downloadrails-84eece0a823e9c601ea99a8709f24605a19bcbfd.tar.gz
rails-84eece0a823e9c601ea99a8709f24605a19bcbfd.tar.bz2
rails-84eece0a823e9c601ea99a8709f24605a19bcbfd.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activemodel/lib/active_model/attribute_methods.rb')
-rw-r--r--activemodel/lib/active_model/attribute_methods.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index a201e983cd..ef0b95424e 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -93,10 +93,10 @@ module ActiveModel
#
# Provides you with:
#
- # AttributePerson.primary_key
+ # Person.primary_key
# # => "sysid"
- # AttributePerson.inheritance_column = 'address'
- # AttributePerson.inheritance_column
+ # Person.inheritance_column = 'address'
+ # Person.inheritance_column
# # => 'address_id'
def define_attr_method(name, value=nil, &block)
sing = singleton_class