aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2016-04-19 20:37:12 +0530
committerVipul A M <vipulnsward@gmail.com>2016-04-19 20:37:12 +0530
commit2d744fee9c05285a4fceb0ac8430a3e6db3ec19a (patch)
tree7a970aa8de1697b31ba53d8fd70fc85a3154b5a9 /actionpack
parentad955470b7e66f7ca1105bb239fec9ee024c5ec0 (diff)
parent46d31a14537f68db80c79395d4daed252af82890 (diff)
downloadrails-2d744fee9c05285a4fceb0ac8430a3e6db3ec19a.tar.gz
rails-2d744fee9c05285a4fceb0ac8430a3e6db3ec19a.tar.bz2
rails-2d744fee9c05285a4fceb0ac8430a3e6db3ec19a.zip
Merge pull request #24630 from aried3r/patch-1
Update send_data documentation [ci skip]
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/metal/data_streaming.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb
index 957e7a3019..59984a0028 100644
--- a/actionpack/lib/action_controller/metal/data_streaming.rb
+++ b/actionpack/lib/action_controller/metal/data_streaming.rb
@@ -84,7 +84,7 @@ module ActionController #:nodoc:
# Options:
# * <tt>:filename</tt> - suggests a filename for the browser to use.
# * <tt>:type</tt> - specifies an HTTP content type. Defaults to 'application/octet-stream'. You can specify
- # either a string or a symbol for a registered type register with <tt>Mime::Type.register</tt>, for example :json
+ # either a string or a symbol for a registered type register with <tt>Mime::Type.register</tt>, for example :json.
# If omitted, type will be guessed from the file extension specified in <tt>:filename</tt>.
# If no content type is registered for the extension, default type 'application/octet-stream' will be used.
# * <tt>:disposition</tt> - specifies whether the file will be shown inline or downloaded.