2 files changed, 17 insertions, 13 deletions
diff --git a/guides/source/action_controller_overview.md b/guides/source/action_controller_overview.md
index 60a19542e6..b912265754 100644
--- a/guides/source/action_controller_overview.md
+++ b/guides/source/action_controller_overview.md
@@ -334,26 +334,24 @@ with a `has_many` association:
 params.require(:book).permit(:title, chapters_attributes: [:title])
 ```
 
-#### Outside the Scope of Strong Parameters
-
-The strong parameter API was designed with the most common use cases
-in mind. It is not meant as a silver bullet to handle all of your
-whitelisting problems. However, you can easily mix the API with your
-own code to adapt to your situation.
-
 Imagine a scenario where you have parameters representing a product
 name and a hash of arbitrary data associated with that product, and
 you want to whitelist the product name attribute and also the whole
-data hash. The strong parameters API doesn't let you directly
-whitelist the whole of a nested hash with any keys, but you can use
-the keys of your nested hash to declare what to whitelist:
+data hash:
 
 ```ruby
 def product_params
-  params.require(:product).permit(:name, data: params[:product][:data].try(:keys))
+  params.require(:product).permit(:name, data: {})
 end
 ```
 
+#### Outside the Scope of Strong Parameters
+
+The strong parameter API was designed with the most common use cases
+in mind. It is not meant as a silver bullet to handle all of your
+whitelisting problems. However, you can easily mix the API with your
+own code to adapt to your situation.
+
 Session
 -------
 
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 7136205b75..6b634028c4 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -667,6 +667,12 @@ There are a number of settings available on `config.action_mailer`:
     config.action_mailer.interceptors = ["MailInterceptor"]
     ```
 
+* `config.action_mailer.preview_interceptors` registers interceptors which will be called before mail is previewed.
+
+    ```ruby
+    config.action_mailer.preview_interceptors = ["MyPreviewMailInterceptor"]
+    ```
+
 * `config.action_mailer.preview_path` specifies the location of mailer previews.
 
     ```ruby
@@ -805,13 +811,13 @@ text/javascript image/svg+xml application/postscript application/x-shockwave-fla
 * `config.active_storage.queue` can be used to set the name of the Active Job queue used to perform jobs like analyzing the content of a blob or purging a blog.
 
   ```ruby
-  config.active_job.queue = :low_priority
+  config.active_storage.queue = :low_priority
   ```
 
 * `config.active_storage.logger` can be used to set the logger used by Active Storage. Accepts a logger conforming to the interface of Log4r or the default Ruby Logger class.
 
   ```ruby
-  config.active_job.logger = ActiveSupport::Logger.new(STDOUT)
+  config.active_storage.logger = ActiveSupport::Logger.new(STDOUT)
   ```
 
 ### Configuring a Database