diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-06-06 22:23:30 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-06-06 22:23:30 +0200 |
| commit | 5e21247131fa7d5484190c9a71b74f9d3f090684 (patch) | |
| tree | 5eee39fcabb952cafd513caf7e67943bc6b26e98 /activemodel/lib/active_model/serializers/xml.rb | |
| parent | 38ad6bb2f566202dd522a0cf31a55a746f122d53 (diff) | |
| parent | 689e12b828665b7b2cfcda85d46249c5cf2aa713 (diff) | |
| download | rails-5e21247131fa7d5484190c9a71b74f9d3f090684.tar.gz rails-5e21247131fa7d5484190c9a71b74f9d3f090684.tar.bz2 rails-5e21247131fa7d5484190c9a71b74f9d3f090684.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
activerecord/RUNNING_UNIT_TESTS
Diffstat (limited to 'activemodel/lib/active_model/serializers/xml.rb')
| -rw-r--r-- | activemodel/lib/active_model/serializers/xml.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb index f6aae24324..9812af43d6 100644 --- a/activemodel/lib/active_model/serializers/xml.rb +++ b/activemodel/lib/active_model/serializers/xml.rb @@ -139,8 +139,8 @@ module ActiveModel # Without any +options+, the returned XML string will include all the model's # attributes. For example: # - # konata = User.find(1) - # konata.to_xml + # user = User.find(1) + # user.to_xml # # <?xml version="1.0" encoding="UTF-8"?> # <user> |