aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-12-30 08:50:33 +0100
committerYves Senn <yves.senn@gmail.com>2015-12-30 08:50:33 +0100
commit6c85aeaa7b9ec3b926987e05cfc6620387d0ae53 (patch)
treedd4662731f4640ab18f11996b6a20aa896bc1d46 /guides
parent1b8084398afe3b7c04dd556227d8292369d74257 (diff)
parent8fa337305f714d1e9e64d2a8cc71465f2b740451 (diff)
downloadrails-6c85aeaa7b9ec3b926987e05cfc6620387d0ae53.tar.gz
rails-6c85aeaa7b9ec3b926987e05cfc6620387d0ae53.tar.bz2
rails-6c85aeaa7b9ec3b926987e05cfc6620387d0ae53.zip
Merge pull request #22844 from prathamesh-sonpatki/issue_22836
Fix documentation for configuring default_charset [ci skip]
Diffstat (limited to 'guides')
-rw-r--r--guides/source/configuring.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 81e406ae2e..14ba343520 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -335,8 +335,6 @@ The schema dumper adds one additional configuration option:
* `config.action_controller.default_static_extension` configures the extension used for cached pages. Defaults to `.html`.
-* `config.action_controller.default_charset` specifies the default character set for all renders. The default is "utf-8".
-
* `config.action_controller.include_all_helpers` configures whether all view helpers are available everywhere or are scoped to the corresponding controller. If set to `false`, `UsersHelper` methods are only available for views rendered as part of `UsersController`. If `true`, `UsersHelper` methods are available everywhere. The default is `true`.
* `config.action_controller.logger` accepts a logger conforming to the interface of Log4r or the default Ruby Logger class, which is then used to log information from Action Controller. Set to `nil` to disable logging.
@@ -369,6 +367,8 @@ The schema dumper adds one additional configuration option:
}
```
+* `config.action_dispatch.default_charset` specifies the default character set for all renders. Defaults to `nil`.
+
* `config.action_dispatch.tld_length` sets the TLD (top-level domain) length for the application. Defaults to `1`.
* `config.action_dispatch.http_auth_salt` sets the HTTP Auth salt value. Defaults