Merge pull request rails#25705 from kaspth/backport-25696-to-5-0-stable

kaspth · web-flow · commit edd8a5b02c50 · 2016-07-05T22:17:35.000+02:00
Backport rails#25696 to 5-0-stable
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt
@@ -6,7 +6,7 @@
 # Once upgraded flip defaults one by one to migrate to the new default.
 #
 <%- end -%>
-# Read the Rails 5.0 release notes for more info on each option.
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
 <%- unless options[:api] -%>
 
 # Enable per-form CSRF tokens. Previous versions had false.

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# Once upgraded flip defaults one by one to migrate to the new default.`
`7`	`7`	`#`
`8`	`8`	`<%- end -%>`
`9`		`-# Read the Rails 5.0 release notes for more info on each option.`
	`9`	`+# Read the Guide for Upgrading Ruby on Rails for more info on each option.`
`10`	`10`	`<%- unless options[:api] -%>`
`11`	`11`
`12`	`12`	`# Enable per-form CSRF tokens. Previous versions had false.`