diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-07-17 20:00:48 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-07-17 20:00:48 +0200 |
| commit | 631b9564d284d1cbcfabeea272df4b853834fe9d (patch) | |
| tree | 343f07190c45ee5c5cd492e77d3f1116bee8a0f2 /activemodel | |
| parent | caddee253c7a865100af157525861ab58afd4715 (diff) | |
| parent | c9630d9d87ad0b4a0fc732034b6a106777e257ca (diff) | |
| download | rails-631b9564d284d1cbcfabeea272df4b853834fe9d.tar.gz rails-631b9564d284d1cbcfabeea272df4b853834fe9d.tar.bz2 rails-631b9564d284d1cbcfabeea272df4b853834fe9d.zip | |
Merge remote branch 'docrails/master'
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 918cd0ab76..500b2399a3 100644 --- a/activemodel/lib/active_model/serializers/json.rb +++ b/activemodel/lib/active_model/serializers/json.rb @@ -19,8 +19,8 @@ module ActiveModel # passed through +options+. # # The option <tt>ActiveModel::Base.include_root_in_json</tt> controls the - # top-level behavior of to_json. It is true by default. When it is <tt>true</tt>, - # to_json will emit a single root node named after the object's type. For example: + # top-level behavior of <tt>to_json</tt>. It is <tt>true</tt> by default. When it is <tt>true</tt>, + # <tt>to_json</tt> will emit a single root node named after the object's type. For example: # # konata = User.find(1) # konata.to_json |