diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 01d98d13c8..b14e029df5 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -188,7 +188,7 @@ ...and you can configure with: - topic.to_xml(:skip_instruct => true, :skip_attributes => [ :id, bonus_time, :written_on, replies_count ]) + topic.to_xml(:skip_instruct => true, :except => [ :id, bonus_time, :written_on, replies_count ]) ...that'll return: diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 8227cbe89d..28ae612dad 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1636,10 +1636,10 @@ module ActiveRecord #:nodoc: # <last-read type="date">2004-04-15</last-read> # </topic> # - # This behaviour can be controlled with :skip_attributes and :skip_instruct + # This behaviour can be controlled with :only, :except, and :skip_instruct # for instance: # - # topic.to_xml(:skip_instruct => true, :skip_attributes => [ :id, bonus_time, :written_on, replies_count ]) + # topic.to_xml(:skip_instruct => true, :except => [ :id, bonus_time, :written_on, replies_count ]) # # <topic> # <title>The First Topic</title> |