Merge pull request #6277 from homakov/patch-6

Comment for active_support's option in application.rb

railties/lib/rails/generators/rails/app/templates/config/application.rb

@@ -43,6 +43,9 @@ class Application < Rails::Application
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+    
+    # Enable escaping HTML in JSON. The default is false.
+    # config.active_support.escape_html_entities_in_json = true
 
     # Use SQL instead of Active Record's schema dumper when creating the database.
     # This is necessary if your schema can't be completely dumped by the schema dumper,