aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource
diff options
context:
space:
mode:
authorOemuer Oezkir <oemuer.oezkir@gmail.com>2011-07-24 10:21:42 +0000
committerOemuer Oezkir <oemuer.oezkir@gmail.com>2011-07-24 10:21:42 +0000
commit71d18ce48ebcb6b3380309a225af12aba2aeb8ed (patch)
treec4d3414b9db81ebe31178b0355a41b5f5dd9f031 /activeresource
parent9b9cf92768614eb7dedd190e898b0062c083d8bf (diff)
downloadrails-71d18ce48ebcb6b3380309a225af12aba2aeb8ed.tar.gz
rails-71d18ce48ebcb6b3380309a225af12aba2aeb8ed.tar.bz2
rails-71d18ce48ebcb6b3380309a225af12aba2aeb8ed.zip
Changed a few instances of of words in the API docs written in British English to
American English(according to Weber)
Diffstat (limited to 'activeresource')
-rw-r--r--activeresource/lib/active_resource/base.rb2
-rw-r--r--activeresource/lib/active_resource/http_mock.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index 74730ca01f..693bd0592e 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -395,7 +395,7 @@ module ActiveResource
# Subclass.site.user = 'david'
# Parent.site # => 'http://david@test.com'
#
- # Without superclass_delegating_reader (expected behaviour)
+ # Without superclass_delegating_reader (expected behavior)
#
# Parent.site = 'http://anonymous@test.com'
# Subclass.site # => 'http://anonymous@test.com'
diff --git a/activeresource/lib/active_resource/http_mock.rb b/activeresource/lib/active_resource/http_mock.rb
index 6167c1420e..36f52d61d3 100644
--- a/activeresource/lib/active_resource/http_mock.rb
+++ b/activeresource/lib/active_resource/http_mock.rb
@@ -149,7 +149,7 @@ module ActiveResource
# Note, by default, every time you call +respond_to+, any previous request and response pairs stored
# in HttpMock will be deleted giving you a clean slate to work on.
#
- # If you want to override this behaviour, pass in +false+ as the last argument to +respond_to+
+ # If you want to override this behavior, pass in +false+ as the last argument to +respond_to+
#
# === Example
#