diff options
author | Xavier Noria <fxn@hashref.com> | 2011-02-02 22:04:11 +0100 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-02-02 22:04:11 +0100 |
commit | a96a9a494856c57bb8773d8d22bbee176cda9d6e (patch) | |
tree | 809c810883599b60cb66537e9403cb7c1d5ad335 /activeresource/lib/active_resource | |
parent | 68e3fb81090ba67575e513407fc2463dba3b002b (diff) | |
parent | 2446b1307ecf4ac13dc9ed3bcaf5a03ef3fcef98 (diff) | |
download | rails-a96a9a494856c57bb8773d8d22bbee176cda9d6e.tar.gz rails-a96a9a494856c57bb8773d8d22bbee176cda9d6e.tar.bz2 rails-a96a9a494856c57bb8773d8d22bbee176cda9d6e.zip |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activeresource/lib/active_resource')
-rw-r--r-- | activeresource/lib/active_resource/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb index d959fd103a..daa8962929 100644 --- a/activeresource/lib/active_resource/base.rb +++ b/activeresource/lib/active_resource/base.rb @@ -200,7 +200,7 @@ module ActiveResource # an ActiveResource::MissingPrefixParam will be raised. # # class Comment < ActiveResource::Base - # self.site = "http://someip.com/posts/:post_id/" + # self.site = "http://someip.com/posts/:post_id/" # end # # Comment.find(1) @@ -1095,7 +1095,7 @@ module ActiveResource end # Delegates to id in order to allow two resources of the same type and \id to work with something like: - # [Person.find(1), Person.find(2)] & [Person.find(1), Person.find(4)] # => [Person.find(1)] + # [(a = Person.find 1), (b = Person.find 2)] & [(c = Person.find 1), (d = Person.find 4)] # => [a] def hash id.hash end |