aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Willson <scott@butlerpress.com>2008-05-28 09:39:14 -0700
committerScott Willson <scott@butlerpress.com>2008-05-28 09:39:14 -0700
commitf49f3e40e9262695ae3cef0e40cc6bfd013183a8 (patch)
tree5f11372e96df740d6e6bce3a1aabea222133d6df
parentc75cfa0e545024b8011a9b350c911ee590a4d3a0 (diff)
parent632c305cd08cc505cc104873be91d378ac7c64d1 (diff)
downloadrails-f49f3e40e9262695ae3cef0e40cc6bfd013183a8.tar.gz
rails-f49f3e40e9262695ae3cef0e40cc6bfd013183a8.tar.bz2
rails-f49f3e40e9262695ae3cef0e40cc6bfd013183a8.zip
Merge branch 'master' of git://github.com/lifo/docrails
-rw-r--r--activeresource/lib/active_resource/base.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index 26931e5e4a..253d336dc9 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -298,7 +298,7 @@ module ActiveResource
@timeout = timeout
end
- # Gets tthe number of seconds after which requests to the REST API should time out.
+ # Gets the number of seconds after which requests to the REST API should time out.
def timeout
if defined?(@timeout)
@timeout
@@ -426,16 +426,16 @@ module ActiveResource
alias_method :set_primary_key, :primary_key= #:nodoc:
- # Create a new resource instance and request to the remote service
+ # Creates a new resource instance and makes a request to the remote service
# that it be saved, making it equivalent to the following simultaneous calls:
#
# ryan = Person.new(:first => 'ryan')
# ryan.save
#
- # The newly created resource is returned. If a failure has occurred an
- # exception will be raised (see save). If the resource is invalid and
- # has not been saved then valid? will return <tt>false</tt>,
- # while new? will still return <tt>true</tt>.
+ # Returns the newly created resource. If a failure has occurred an
+ # exception will be raised (see <tt>save</tt>). If the resource is invalid and
+ # has not been saved then <tt>valid?</tt> will return <tt>false</tt>,
+ # while <tt>new?</tt> will still return <tt>true</tt>.
#
# ==== Examples
# Person.create(:name => 'Jeremy', :email => 'myname@nospam.com', :enabled => true)