diff options
author | Lee Reilly <lee@leereilly.net> | 2010-12-21 19:50:27 -0800 |
---|---|---|
committer | Lee Reilly <lee@leereilly.net> | 2010-12-21 19:50:27 -0800 |
commit | b78d288a55f9ba21a38cce1913eecb1dbedddefb (patch) | |
tree | ae98d458ec104999a3965210de6dd429bf18e4a7 | |
parent | 55b01e65e21203d87d60bc0fad54702384ffaa2b (diff) | |
parent | 0b0e6f13c02a425f60bfed9db401392d72f419c6 (diff) | |
download | rails-b78d288a55f9ba21a38cce1913eecb1dbedddefb.tar.gz rails-b78d288a55f9ba21a38cce1913eecb1dbedddefb.tar.bz2 rails-b78d288a55f9ba21a38cce1913eecb1dbedddefb.zip |
Merge branch 'master' of github.com:lifo/docrails
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/reloader.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/reloader.rb b/actionpack/lib/action_dispatch/middleware/reloader.rb index efa0bc7129..7624a1871a 100644 --- a/actionpack/lib/action_dispatch/middleware/reloader.rb +++ b/actionpack/lib/action_dispatch/middleware/reloader.rb @@ -6,7 +6,7 @@ module ActionDispatch # after each request. In this respect they are analogs of ActionDispatch::Callback's # before and after callbacks. However, cleanup callbacks are not called until the # request is fully complete -- that is, after #close has been called on - # the request body. This is important for streaming responses such as the + # the response body. This is important for streaming responses such as the # following: # # self.response_body = lambda { |response, output| |