From 8fa337305f714d1e9e64d2a8cc71465f2b740451 Mon Sep 17 00:00:00 2001
From: Prathamesh Sonpatki <csonpatki@gmail.com>
Date: Wed, 30 Dec 2015 11:35:47 +0530
Subject: Fix documentation for configuring default_charset [ci skip]
- Fixes #22836.
---
guides/source/configuring.md | 4 ++--
1 file 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
--
cgit v1.2.3