diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-04-01 20:10:42 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-04-01 20:10:42 +0000 |
| commit | 12c5287e30be98d4becb4319aedd8375d45322e6 (patch) | |
| tree | 0480b1f66bdd2e59aaabfc24e3e935c804fdb122 | |
| parent | 53aa8da1a73bc283bc8b2e1469be9e0fe5855ab7 (diff) | |
| download | rails-12c5287e30be98d4becb4319aedd8375d45322e6.tar.gz rails-12c5287e30be98d4becb4319aedd8375d45322e6.tar.bz2 rails-12c5287e30be98d4becb4319aedd8375d45322e6.zip | |
Doc fix (closes #4515)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4124 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -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> |