4 files changed, 16 insertions, 15 deletions
diff --git a/guides/source/5_0_release_notes.md b/guides/source/5_0_release_notes.md
index e504514e72..7ced92d829 100644
--- a/guides/source/5_0_release_notes.md
+++ b/guides/source/5_0_release_notes.md
@@ -82,6 +82,9 @@ Please refer to the [Changelog][railties] for detailed changes.
 *   Removed the documentation tasks `doc:app`, `doc:rails`, and `doc:guides`.
     ([commit](https://github.com/rails/rails/commit/cd7cc5254b090ccbb84dcee4408a5acede25ef2a))
 
+*   Removed `Rack::ContentLength` middleware from the default
+    stack. ([Commit](https://github.com/rails/rails/commit/56903585a099ab67a7acfaaef0a02db8fe80c450))
+
 ### Deprecations
 
 *   Deprecated `config.static_cache_control` in favor of
@@ -107,9 +110,6 @@ Please refer to the [Changelog][railties] for detailed changes.
     the order they are invoked by Rails.
     ([Pull Request](https://github.com/rails/rails/pull/19323))
 
-*   Removed `Rack::ContentLength` middleware from the default
-    stack. ([Commit](https://github.com/rails/rails/commit/56903585a099ab67a7acfaaef0a02db8fe80c450))
-
 *   Added `bin/rails dev:cache` to enable or disable caching in development mode.
     ([Pull Request](https://github.com/rails/rails/pull/20961))
 
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
diff --git a/guides/source/initialization.md b/guides/source/initialization.md
index 7bf7eebb62..6232ef4c57 100644
--- a/guides/source/initialization.md
+++ b/guides/source/initialization.md
@@ -530,16 +530,17 @@ This file is responsible for requiring all the individual frameworks of Rails:
 require "rails"
 
 %w(
-  active_record
-  action_controller
-  action_view
-  action_mailer
-  active_job
-  rails/test_unit
-  sprockets
-).each do |framework|
+  active_record/railtie
+  action_controller/railtie
+  action_view/railtie
+  action_mailer/railtie
+  active_job/railtie
+  action_cable/engine
+  rails/test_unit/railtie
+  sprockets/railtie
+).each do |railtie|
   begin
-    require "#{framework}/railtie"
+    require "#{railtie}"
   rescue LoadError
   end
 end
diff --git a/guides/source/testing.md b/guides/source/testing.md
index a4b62955c5..84f80e3c37 100644
--- a/guides/source/testing.md
+++ b/guides/source/testing.md
@@ -654,7 +654,7 @@ The easiest way to see functional tests in action is to generate a controller
 scaffold:
 
 ```bash
-$ bin/rails generate scaffold_controller article title:string body:test
+$ bin/rails generate scaffold_controller article title:string body:text
 ...
 create  app/controllers/articles_controller.rb
 ...