aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-07-06 05:23:42 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-07-06 05:23:42 +0000
commit38e78c626068ed7a2840dc97c9af551f8f106786 (patch)
tree31179f7f38aa08564dd834522680c732536abecf /actionpack
parent6f26511076b36dbad51d7c68881f98e35d984325 (diff)
downloadrails-38e78c626068ed7a2840dc97c9af551f8f106786.tar.gz
rails-38e78c626068ed7a2840dc97c9af551f8f106786.tar.bz2
rails-38e78c626068ed7a2840dc97c9af551f8f106786.zip
Fixed documentation snafu with send_file -- the option is :stream, not :streaming #1621 [evl]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1723 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/streaming.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/streaming.rb b/actionpack/lib/action_controller/streaming.rb
index 8118fff1c9..2914fd907b 100644
--- a/actionpack/lib/action_controller/streaming.rb
+++ b/actionpack/lib/action_controller/streaming.rb
@@ -24,7 +24,7 @@ module ActionController #:nodoc:
# Defaults to 'application/octet-stream'.
# * <tt>:disposition</tt> - specifies whether the file will be shown inline or downloaded.
# Valid values are 'inline' and 'attachment' (default).
- # * <tt>:streaming</tt> - whether to send the file to the user agent as it is read (true)
+ # * <tt>:stream</tt> - whether to send the file to the user agent as it is read (true)
# or to read the entire file before sending (false). Defaults to true.
# * <tt>:buffer_size</tt> - specifies size (in bytes) of the buffer used to stream the file.
# Defaults to 4096.