diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-12 17:36:09 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-12 17:36:09 +0200 |
| commit | 4134d7db34506887f5cb945bb4e51c53c5f67ec3 (patch) | |
| tree | 161991a34115f2ecd41725ab65af0895b93489ed /activemodel/lib/active_model | |
| parent | e4943e93c2571cba8630eec2e77000300947866b (diff) | |
| parent | 8af2186d26c77f6fcb0787f50941ebe1a2905c5f (diff) | |
| download | rails-4134d7db34506887f5cb945bb4e51c53c5f67ec3.tar.gz rails-4134d7db34506887f5cb945bb4e51c53c5f67ec3.tar.bz2 rails-4134d7db34506887f5cb945bb4e51c53c5f67ec3.zip | |
Merge remote branch 'docrails/master'
Diffstat (limited to 'activemodel/lib/active_model')
| -rw-r--r-- | activemodel/lib/active_model/serializers/json.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/serializers/json.rb b/activemodel/lib/active_model/serializers/json.rb index e1dbc522de..cf1c4a0fed 100644 --- a/activemodel/lib/active_model/serializers/json.rb +++ b/activemodel/lib/active_model/serializers/json.rb @@ -18,9 +18,9 @@ module ActiveModel # Returns a JSON string representing the model. Some configuration can be # passed through +options+. # - # The option <tt>ActiveModel::Base.include_root_in_json</tt> controls the - # top-level behavior of +to_json+. If true (the default) +to_json+ will - # emit a single root node named after the object's type. For example: + # The option <tt>include_root_in_json</tt> controls the top-level behavior + # of +to_json+. If true (the default) +to_json+ will emit a single root + # node named after the object's type. For example: # # konata = User.find(1) # konata.to_json |