Merge pull request #16536 from rails/improve-custom-configuration

Improve custom configuration

2 files changed, 19 insertions, 15 deletions

diff --git a/guides/source/4_2_release_notes.md b/guides/source/4_2_release_notes.md
index 1c14519506..9937a947a5 100644
--- a/guides/source/4_2_release_notes.md
+++ b/guides/source/4_2_release_notes.md
@@ -75,22 +75,24 @@ Please refer to the [Changelog][railties] for detailed changes.
 *   Introduced an `after_bundle` callback for use in Rails templates.
     ([Pull Request](https://github.com/rails/rails/pull/16359))
 
-*   Introduced the `x` namespace for defining custom configuration options:
+*   Custom configuration options can be chained:
 
     ```ruby
     # config/environments/production.rb
-    config.x.payment_processing.schedule = :daily
-    config.x.payment_processing.retries  = 3
-    config.x.super_debugger = true
+    config.payment_processing.schedule = :daily
+    config.payment_processing.retries  = 3
+    config.resque = { timeout: 60, inline_jobs: :always }
+    config.super_debugger = true
     ```
 
     These options are then available through the configuration object:
 
     ```ruby
-    Rails.configuration.x.payment_processing.schedule # => :daily
-    Rails.configuration.x.payment_processing.retries  # => 3
-    Rails.configuration.x.super_debugger              # => true
-    Rails.configuration.x.super_debugger.not_set      # => nil
+    Rails.configuration.payment_processing.schedule # => :daily
+    Rails.configuration.payment_processing.retries  # => 3
+    Rails.configuration.resque.timeout              # => 60
+    Rails.configuration.resque.inline_jobs          # => :always
+    Rails.configuration.super_debugger              # => true
     ```
 
     ([Commit](https://github.com/rails/rails/commit/611849772dd66c2e4d005dcfe153f7ce79a8a7db))
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 801cef5ca6..6922dd681a 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -1006,16 +1006,18 @@ Custom configuration
 You can configure your own code through the Rails configuration object with custom configuration. It works like this:
 
   ```ruby
-  config.x.payment_processing.schedule = :daily
-  config.x.payment_processing.retries  = 3
-  config.x.super_debugger = true
+  config.payment_processing.schedule = :daily
+  config.payment_processing.retries  = 3
+  config.resque = { timeout: 60, inline_jobs: :always }
+  config.super_debugger = true
   ```
 
 These configuration points are then available through the configuration object:
 
   ```ruby
-  Rails.configuration.x.payment_processing.schedule # => :daily
-  Rails.configuration.x.payment_processing.retries  # => 3
-  Rails.configuration.x.super_debugger              # => true
-  Rails.configuration.x.super_debugger.not_set      # => nil
+  Rails.configuration.payment_processing.schedule # => :daily
+  Rails.configuration.payment_processing.retries  # => 3
+  Rails.configuration.resque.timeout              # => 60
+  Rails.configuration.resque.inline_jobs          # => :always
+  Rails.configuration.super_debugger              # => true
   ```