diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-10-05 18:42:18 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-10-05 18:42:18 +0530 |
| commit | 46ce7f1f77b91d3762e7eeab16a19afcb79c8477 (patch) | |
| tree | 89b3b5c780f130e628a67af48a2a657ee40eda6f /activemodel | |
| parent | ae4febdf841f4de2889c05ecd1b2b19e1d7f1697 (diff) | |
| parent | ea49935a6e0eca8783bc8d1bb46a6c518c073cac (diff) | |
| download | rails-46ce7f1f77b91d3762e7eeab16a19afcb79c8477.tar.gz rails-46ce7f1f77b91d3762e7eeab16a19afcb79c8477.tar.bz2 rails-46ce7f1f77b91d3762e7eeab16a19afcb79c8477.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/lib/active_model/attribute_methods.rb | 6 | ||||
| -rw-r--r-- | activemodel/lib/active_model/serializers/json.rb | 4 |
2 files changed, 5 insertions, 5 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 diff --git a/activemodel/lib/active_model/serializers/json.rb b/activemodel/lib/active_model/serializers/json.rb index 885964633f..c845440120 100644 --- a/activemodel/lib/active_model/serializers/json.rb +++ b/activemodel/lib/active_model/serializers/json.rb @@ -15,7 +15,7 @@ module ActiveModel self.include_root_in_json = true end - # Returns a JSON string representing the model. Some configuration can be + # Returns a hash representing the model. Some configuration can be # passed through +options+. # # The option <tt>include_root_in_json</tt> controls the top-level behavior @@ -42,7 +42,7 @@ module ActiveModel # The remainder of the examples in this section assume include_root_in_json is set to # <tt>false</tt>. # - # Without any +options+, the returned JSON string will include all the model's + # Without any +options+, the returned Hash will include all the model's # attributes. For example: # # user = User.find(1) |