aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/mime_type.rb
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2007-10-15 07:04:10 +0000
committerMichael Koziarski <michael@koziarski.com>2007-10-15 07:04:10 +0000
commitfe234a1538dd96c6e0d3ca44b651fcc7abc4663e (patch)
tree0e73892be0c99976f1e1b4d65902e4118b6ec185 /actionpack/lib/action_controller/mime_type.rb
parent3353b85b0eae76bf36ae7c2f7b6adc1863278a8e (diff)
downloadrails-fe234a1538dd96c6e0d3ca44b651fcc7abc4663e.tar.gz
rails-fe234a1538dd96c6e0d3ca44b651fcc7abc4663e.tar.bz2
rails-fe234a1538dd96c6e0d3ca44b651fcc7abc4663e.zip
Fix Json related documentation for render and the AR serializer. Closes #9814. Closes #9833. [chuyeow]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7905 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/mime_type.rb')
-rw-r--r--actionpack/lib/action_controller/mime_type.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/mime_type.rb b/actionpack/lib/action_controller/mime_type.rb
index ef5fee0864..a0e2e70deb 100644
--- a/actionpack/lib/action_controller/mime_type.rb
+++ b/actionpack/lib/action_controller/mime_type.rb
@@ -52,7 +52,7 @@ module Mime
EXTENSION_LOOKUP[extension]
end
- # Registers an alias that's not usd on mime type lookup, but can be referenced directly. Especially useful for
+ # Registers an alias that's not used on mime type lookup, but can be referenced directly. Especially useful for
# rendering different HTML versions depending on the user agent, like an iPhone.
def register_alias(string, symbol, extension_synonyms = [])
register(string, symbol, [], extension_synonyms, true)