diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-01 19:06:03 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-01 19:06:03 +0530 |
| commit | 42ff22f33a8963f1a1352f98e83b9918aa1a160d (patch) | |
| tree | 3f43a8acee3ab20de78c4c9e30792296fddd06e4 /actionpack/lib/action_controller/metal | |
| parent | 3cc6995e714bc763b40eb3e1d710c1e5ded44384 (diff) | |
| parent | 339602b219e1fd842599f6750eb965f327a995c4 (diff) | |
| download | rails-42ff22f33a8963f1a1352f98e83b9918aa1a160d.tar.gz rails-42ff22f33a8963f1a1352f98e83b9918aa1a160d.tar.bz2 rails-42ff22f33a8963f1a1352f98e83b9918aa1a160d.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/data_streaming.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/params_wrapper.rb | 2 |
2 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 374645c9ce..379ff97048 100644 --- a/actionpack/lib/action_controller/metal/data_streaming.rb +++ b/actionpack/lib/action_controller/metal/data_streaming.rb @@ -14,7 +14,7 @@ module ActionController #:nodoc: protected # Sends the file. This uses a server-appropriate method (such as X-Sendfile) # via the Rack::Sendfile middleware. The header to use is set via - # config.action_dispatch.x_sendfile_header. + # +config.action_dispatch.x_sendfile_header+. # Your server can also configure this for you by setting the X-Sendfile-Type header. # # Be careful to sanitize the path parameter if it is coming from a web diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb index 17e2db74d4..7e2316d01c 100644 --- a/actionpack/lib/action_controller/metal/params_wrapper.rb +++ b/actionpack/lib/action_controller/metal/params_wrapper.rb @@ -48,7 +48,7 @@ module ActionController # method attribute_names. # # If you're going to pass the parameters to an +ActiveModel+ object (such as - # +User.new(params[:user])+), you might consider passing the model class to + # <tt>User.new(params[:user])</tt>), you might consider passing the model class to # the method instead. The +ParamsWrapper+ will actually try to determine the # list of attribute names from the model and only wrap those attributes: # |