aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-05-29 12:46:35 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-05-29 12:46:35 -0700
commiteb3f81f9dce7a7e22ff228a564408daeef09a11e (patch)
treeea9623612567ea02dbdd5a73463274bb3f92a6f9 /activeresource
parent18b153d15d76ff2f06b76a16ca46b548b7d6750a (diff)
parent4f234bfd799f471490775a2843b3cf7db2af21ed (diff)
downloadrails-eb3f81f9dce7a7e22ff228a564408daeef09a11e.tar.gz
rails-eb3f81f9dce7a7e22ff228a564408daeef09a11e.tar.bz2
rails-eb3f81f9dce7a7e22ff228a564408daeef09a11e.zip
Merge pull request #1398 from leereilly/my_new_branch
Corrected some typos and American vs. Queen's English issues
Diffstat (limited to 'activeresource')
-rw-r--r--activeresource/lib/active_resource/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index 0c272fa093..74730ca01f 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -283,7 +283,7 @@ module ActiveResource
# attribute 'name', :string
#
# # or use the convenience methods and pass >=1 attribute names
- # string 'eye_colour', 'hair_colour'
+ # string 'eye_color', 'hair_color'
# integer 'age'
# float 'height', 'weight'
#