diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-12 19:10:49 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-12 19:10:49 +0530 |
commit | 70237e7dd3dde34dd4b7849619457bcb214ff674 (patch) | |
tree | 660564946242a4307621b0ff397a87a0add398e2 /guides/source/configuring.textile | |
parent | f2f6534272b7895aa39183890043bc8c8e0ee1e8 (diff) | |
parent | 84d198b4a0846ae74ff49001adaa7c3c80bc0607 (diff) | |
download | rails-70237e7dd3dde34dd4b7849619457bcb214ff674.tar.gz rails-70237e7dd3dde34dd4b7849619457bcb214ff674.tar.bz2 rails-70237e7dd3dde34dd4b7849619457bcb214ff674.zip |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activesupport/lib/active_support/callbacks.rb
Diffstat (limited to 'guides/source/configuring.textile')
-rw-r--r-- | guides/source/configuring.textile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/configuring.textile b/guides/source/configuring.textile index c4e54348d4..b2c9300034 100644 --- a/guides/source/configuring.textile +++ b/guides/source/configuring.textile @@ -448,9 +448,9 @@ There are a few configuration options available in Active Support: * +config.active_support.bare+ enables or disables the loading of +active_support/all+ when booting Rails. Defaults to +nil+, which means +active_support/all+ is loaded. -* +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.escape_html_entities_in_json+ enables or disables the escaping of HTML entities in JSON serialization. Defaults to +false+. -* +config.active_support.use_standard_json_time_format+ enables or disables serializing dates to ISO 8601 format. Defaults to +false+. +* +config.active_support.use_standard_json_time_format+ enables or disables serializing dates to ISO 8601 format. Defaults to +true+. * +ActiveSupport::BufferedLogger.silencer+ is set to +false+ to disable the ability to silence logging in a block. The default is +true+. |