diff options
author | Xavier Noria <fxn@hashref.com> | 2010-07-13 18:41:09 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-07-13 18:41:09 +0200 |
commit | 6d2e4ee96c22502380dc94bebdead56133143b9e (patch) | |
tree | d25bddeda96903d0a6ec75ca087898875fa2981d /actionpack/lib/action_controller | |
parent | b75fca9e57423eec81384ff3e35f38fd4f7fe47f (diff) | |
parent | 7e075e62479a0eccad6eaf7a7c20f45347860c83 (diff) | |
download | rails-6d2e4ee96c22502380dc94bebdead56133143b9e.tar.gz rails-6d2e4ee96c22502380dc94bebdead56133143b9e.tar.bz2 rails-6d2e4ee96c22502380dc94bebdead56133143b9e.zip |
Merge remote branch 'docrails/master'
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/metal/mime_responds.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb index 4f384d1ec5..c12e5797ae 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -145,7 +145,7 @@ module ActionController #:nodoc: # and accept Rails' defaults, life will be much easier. # # If you need to use a MIME type which isn't supported by default, you can register your own handlers in - # environment.rb as follows. + # config/initializers/mime_types.rb as follows. # # Mime::Type.register "image/jpg", :jpg # |