diff options
author | Manuel Menezes de Sequeira <MMSequeira@gmail.com> | 2011-10-05 11:59:47 +0100 |
---|---|---|
committer | Manuel Menezes de Sequeira <MMSequeira@gmail.com> | 2011-10-05 11:59:47 +0100 |
commit | 34ed93931dcf688bc4f0f8f5649a44f2f1118a6a (patch) | |
tree | e159d7da33adb7012dd523c09d95a7d4d191affb /activemodel | |
parent | 4406bbe147f87cd3086076ee1544830d0c8c88b3 (diff) | |
parent | a44bbfc1c7edb044ed9f73c7365a3a4a30b8b3fc (diff) | |
download | rails-34ed93931dcf688bc4f0f8f5649a44f2f1118a6a.tar.gz rails-34ed93931dcf688bc4f0f8f5649a44f2f1118a6a.tar.bz2 rails-34ed93931dcf688bc4f0f8f5649a44f2f1118a6a.zip |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activemodel')
-rw-r--r-- | activemodel/lib/active_model/serializers/json.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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) |