From 4858310e3663f10bba85e4c2013c803b4bd6cbbc Mon Sep 17 00:00:00 2001
From: Claas Zurawski <claas.zurawski@googlemail.com>
Date: Wed, 22 Aug 2018 10:04:28 +0200
Subject: Added explanation about new_framework_defaults.rb file [ci skip]

---
 guides/source/upgrading_ruby_on_rails.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 319bc09be3..7e77181efd 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -66,6 +66,13 @@ Overwrite /myapp/config/application.rb? (enter "h" for help) [Ynaqdh]
 
 Don't forget to review the difference, to see if there were any unexpected changes.
 
+### Configure Framework Defaults
+
+The new Rails version might have different configuration defaults than the previous version. However, after following the steps described above, your application would still run with configuration defaults from the *previous* Rails version. That's because the value for `config.load_defaults` in `config/application` has not been changed yet.
+ 
+To allow you to upgrade to new defaults one by one, the update task has created a file `config/initializers/new_framework_defaults.rb`. Once your application is ready to run with new defaults, you can remove this file and flip the `config.load_defaults` value.
+
+
 Upgrading from Rails 5.2 to Rails 6.0
 -------------------------------------
 
-- 
cgit v1.2.3


From d587cf2325c26467e820f8997824c744ba7bc550 Mon Sep 17 00:00:00 2001
From: Claas Zurawski <claas.zurawski@googlemail.com>
Date: Wed, 22 Aug 2018 10:15:49 +0200
Subject: Fixed file name [ci skip]

---
 guides/source/upgrading_ruby_on_rails.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 7e77181efd..89de180508 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -68,7 +68,7 @@ Don't forget to review the difference, to see if there were any unexpected chang
 
 ### Configure Framework Defaults
 
-The new Rails version might have different configuration defaults than the previous version. However, after following the steps described above, your application would still run with configuration defaults from the *previous* Rails version. That's because the value for `config.load_defaults` in `config/application` has not been changed yet.
+The new Rails version might have different configuration defaults than the previous version. However, after following the steps described above, your application would still run with configuration defaults from the *previous* Rails version. That's because the value for `config.load_defaults` in `config/application.rb` has not been changed yet.
  
 To allow you to upgrade to new defaults one by one, the update task has created a file `config/initializers/new_framework_defaults.rb`. Once your application is ready to run with new defaults, you can remove this file and flip the `config.load_defaults` value.
 
-- 
cgit v1.2.3