aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2016-02-13 00:27:55 +0530
committerVipul A M <vipulnsward@gmail.com>2016-02-13 00:27:55 +0530
commitd50d7094247aad5005cd1b47258ddf338b0dddd7 (patch)
tree935a261fe3dd19b42ef4ae9aa4986690ad51a654
parentdb64cbad6dea662e1deee608cca79d8e1805b02f (diff)
parent1a61496ae5945c0412a3e1692c5909635fb9f27b (diff)
downloadrails-d50d7094247aad5005cd1b47258ddf338b0dddd7.tar.gz
rails-d50d7094247aad5005cd1b47258ddf338b0dddd7.tar.bz2
rails-d50d7094247aad5005cd1b47258ddf338b0dddd7.zip
Merge pull request #23642 from tvon/chore/fix-path-omission
Fix 'config/production.rb' path in comment
-rw-r--r--guides/source/4_2_release_notes.md2
-rw-r--r--guides/source/asset_pipeline.md2
-rw-r--r--railties/lib/rails/application.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/guides/source/4_2_release_notes.md b/guides/source/4_2_release_notes.md
index 8a59007420..73e6c2c05b 100644
--- a/guides/source/4_2_release_notes.md
+++ b/guides/source/4_2_release_notes.md
@@ -405,7 +405,7 @@ Please refer to the [Changelog][railties] for detailed changes.
url: http://localhost:3001
namespace: my_app_development
- # config/production.rb
+ # config/environments/production.rb
Rails.application.configure do
config.middleware.use ExceptionNotifier, config_for(:exception_notification)
end
diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index 4efffc6605..5dd54bf8ad 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -901,7 +901,7 @@ your CDN server, you need to tell browsers to use your CDN to grab assets
instead of your Rails server directly. You can do this by configuring Rails to
set your CDN as the asset host instead of using a relative path. To set your
asset host in Rails, you need to set `config.action_controller.asset_host` in
-`config/production.rb`:
+`config/environments/production.rb`:
```ruby
config.action_controller.asset_host = 'mycdnsubdomain.fictional-cdn.com'
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index cac31e1eed..bff33ff42e 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -214,7 +214,7 @@ module Rails
# url: http://localhost:3001
# namespace: my_app_development
#
- # # config/production.rb
+ # # config/environments/production.rb
# Rails.application.configure do
# config.middleware.use ExceptionNotifier, config_for(:exception_notification)
# end