aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-05-11 13:34:23 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-05-11 13:34:23 -0300
commitfe1055fc84c995cb897f07ddb82f14fc7493c616 (patch)
treeac9376db4b3a24d33dd697c4349b0a45400dde68
parent16f3871c3efa2cc031bc2b5a001b580592febd02 (diff)
parentc59382b3b142c7225ce4ead04c0c85982120df8a (diff)
downloadrails-fe1055fc84c995cb897f07ddb82f14fc7493c616.tar.gz
rails-fe1055fc84c995cb897f07ddb82f14fc7493c616.tar.bz2
rails-fe1055fc84c995cb897f07ddb82f14fc7493c616.zip
Merge pull request #20112 from eagletmt/doc-fix
Fix default value in guide [ci skip]
-rw-r--r--guides/source/configuring.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 4da369be5e..342d39a528 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -526,7 +526,7 @@ There are a few configuration options available in Active Support:
* `config.active_support.test_order` sets the order that test cases are executed. Possible values are `:random` and `:sorted`. This option is set to `:random` in `config/environments/test.rb` in newly-generated applications. If you have an application that does not specify a `test_order`, it will default to `:sorted`, *until* Rails 5.0, when the default will become `:random`.
-* `config.active_support.escape_html_entities_in_json` enables or disables the escaping of HTML entities in JSON serialization. Defaults to `false`.
+* `config.active_support.escape_html_entities_in_json` enables or disables the escaping of HTML entities in JSON serialization. Defaults to `true`.
* `config.active_support.use_standard_json_time_format` enables or disables serializing dates to ISO 8601 format. Defaults to `true`.