Merge pull request rails#42720 from p8/railties/framework-defaults-rewording

rafaelfranca · web-flow · commit 28fbdfc8db1f · 2021-07-07T10:32:53.000-04:00
Clarify new_framework_defaults instructions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_7_0.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_7_0.rb.tt
@@ -1,8 +1,10 @@
 # Be sure to restart your server when you modify this file.
 #
-# This file contains migration options to ease your Rails 7.0 upgrade.
+# This file eases your Rails 7.0 framework defaults upgrade.
 #
-# Once upgraded flip defaults one by one to migrate to the new default.
+# Uncomment each configuration one by one to switch to the new default.
+# Once your application is ready to run with all new defaults, you can remove
+# this file and set the `config.load_defaults` to `7.0`.
 #
 # Read the Guide for Upgrading Ruby on Rails for more info on each option.
 

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
`1`	`1`	`# Be sure to restart your server when you modify this file.`
`2`	`2`	`#`
`3`		`-# This file contains migration options to ease your Rails 7.0 upgrade.`
	`3`	`+# This file eases your Rails 7.0 framework defaults upgrade.`
`4`	`4`	`#`
`5`		`-# Once upgraded flip defaults one by one to migrate to the new default.`
	`5`	`+# Uncomment each configuration one by one to switch to the new default.`
	`6`	`+# Once your application is ready to run with all new defaults, you can remove`
	`7`	+# this file and set the `config.load_defaults` to `7.0`.
`6`	`8`	`#`
`7`	`9`	`# Read the Guide for Upgrading Ruby on Rails for more info on each option.`
`8`	`10`