aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-08-16 00:07:17 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-08-16 00:07:17 +0530
commit176f0888d85da38e3ae95f74b419d22e347d7a81 (patch)
tree0a46e2a790cf34785b7e8048e21fb598010e23e8 /actionpack/lib/action_controller
parentebb4a3d5becd535074502a4bf1b61a5b18e30917 (diff)
parent62499bcb9d8aa65636f5cd3ace2a818ffd4e2f8a (diff)
downloadrails-176f0888d85da38e3ae95f74b419d22e347d7a81.tar.gz
rails-176f0888d85da38e3ae95f74b419d22e347d7a81.tar.bz2
rails-176f0888d85da38e3ae95f74b419d22e347d7a81.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/data_streaming.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb
index 379ff97048..5422cb93c4 100644
--- a/actionpack/lib/action_controller/metal/data_streaming.rb
+++ b/actionpack/lib/action_controller/metal/data_streaming.rb
@@ -76,8 +76,8 @@ module ActionController #:nodoc:
end
# Avoid having to pass an open file handle as the response body.
- # Rack::Sendfile will usually intercepts the response and just uses
- # the path directly, so no reason to open the file.
+ # Rack::Sendfile will usually intercept the response and uses
+ # the path directly, so there is no reason to open the file.
class FileBody #:nodoc:
attr_reader :to_path