diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-12-05 10:33:50 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-12-05 10:33:50 +0100 |
| commit | 48386d245bc169d3a36e5f305927bd968b108fea (patch) | |
| tree | 9156d3535c42e7f56af6e69fbbd5164ccb4fcc95 /actionpack/lib/action_dispatch | |
| parent | b696dd70db651c6cb4a096dd0d5762416acd9917 (diff) | |
| parent | e1d0d5ae81d2b02eebb1afbfb79edf0a2da2d48e (diff) | |
| download | rails-48386d245bc169d3a36e5f305927bd968b108fea.tar.gz rails-48386d245bc169d3a36e5f305927bd968b108fea.tar.bz2 rails-48386d245bc169d3a36e5f305927bd968b108fea.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/mime_type.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb index c1503c7eeb..5b87a80c1b 100644 --- a/actionpack/lib/action_dispatch/http/mime_type.rb +++ b/actionpack/lib/action_dispatch/http/mime_type.rb @@ -178,10 +178,10 @@ module Mime end # input: 'text' - # returend value: [Mime::JSON, Mime::XML, Mime::ICS, Mime::HTML, Mime::CSS, Mime::CSV, Mime::JS, Mime::YAML, Mime::TEXT] + # returned value: [Mime::JSON, Mime::XML, Mime::ICS, Mime::HTML, Mime::CSS, Mime::CSV, Mime::JS, Mime::YAML, Mime::TEXT] # # input: 'application' - # returend value: [Mime::HTML, Mime::JS, Mime::XML, Mime::YAML, Mime::ATOM, Mime::JSON, Mime::RSS, Mime::URL_ENCODED_FORM + # returned value: [Mime::HTML, Mime::JS, Mime::XML, Mime::YAML, Mime::ATOM, Mime::JSON, Mime::RSS, Mime::URL_ENCODED_FORM] def parse_data_with_trailing_star(input) Mime::SET.select { |m| m =~ input } end |