aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Kampmeier <chris@kampers.net>2008-05-16 12:09:46 -0700
committerChris Kampmeier <chris@kampers.net>2008-05-16 13:45:28 -0700
commit70e4bcf5cb039bea073851faed2df9f465e6f2f8 (patch)
tree39233d2345a1aa1b92e93ff9453c48181a265fbf
parent6ea5e4208f724b50e774e6a1af027336c3ee3de1 (diff)
downloadrails-70e4bcf5cb039bea073851faed2df9f465e6f2f8.tar.gz
rails-70e4bcf5cb039bea073851faed2df9f465e6f2f8.tar.bz2
rails-70e4bcf5cb039bea073851faed2df9f465e6f2f8.zip
Fix a couple spelling errors in docs
-rw-r--r--actionpack/lib/action_controller/mime_responds.rb2
-rw-r--r--railties/configs/initializers/new_rails_defaults.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/mime_responds.rb b/actionpack/lib/action_controller/mime_responds.rb
index a17782cafc..1dbd8b9e6f 100644
--- a/actionpack/lib/action_controller/mime_responds.rb
+++ b/actionpack/lib/action_controller/mime_responds.rb
@@ -92,7 +92,7 @@ module ActionController #:nodoc:
# with the remaining data.
#
# Note that you can define your own XML parameter parser which would allow you to describe multiple entities
- # in a single request (i.e., by wrapping them all in a single root note), but if you just go with the flow
+ # in a single request (i.e., by wrapping them all in a single root node), but if you just go with the flow
# and accept Rails' defaults, life will be much easier.
#
# If you need to use a MIME type which isn't supported by default, you can register your own handlers in
diff --git a/railties/configs/initializers/new_rails_defaults.rb b/railties/configs/initializers/new_rails_defaults.rb
index b8f0e2cac2..1a718608ae 100644
--- a/railties/configs/initializers/new_rails_defaults.rb
+++ b/railties/configs/initializers/new_rails_defaults.rb
@@ -1,4 +1,4 @@
-# These settins change the behavior of Rails 2 apps and will be defaults
+# These settings change the behavior of Rails 2 apps and will be defaults
# for Rails 3. You can remove this initializer when Rails 3 is released.
# Only save the attributes that have changed since the record was loaded.