Merge pull request rails#49456 from seanpdoyle/strong-parameters-deep-merge-rdoc

Fix `ActionController::Parameters#deep_merge` RDoc [ci skip]

Author: jonathanhefner

actionpack/lib/action_controller/metal/strong_parameters.rb

@@ -144,6 +144,31 @@ class Parameters
 
     cattr_accessor :action_on_unpermitted_parameters, instance_accessor: false
 
+    ##
+    # :method: deep_merge
+    #
+    # :call-seq:
+    #   deep_merge(other_hash, &block)
+    #
+    # Returns a new +ActionController::Parameters+ instance with +self+ and +other_hash+ merged recursively.
+    #
+    # Like with <tt>Hash#merge</tt> in the standard library, a block can be provided
+    # to merge values.
+    #
+    #--
+    # Implemented by ActiveSupport::DeepMergeable#deep_merge.
+
+    ##
+    # :method: deep_merge!
+    #
+    # :call-seq:
+    #   deep_merge!(other_hash, &block)
+    #
+    # Same as +#deep_merge+, but modifies +self+.
+    #
+    #--
+    # Implemented by ActiveSupport::DeepMergeable#deep_merge!.
+
     ##
     # :method: as_json
     #
@@ -866,28 +891,7 @@ def merge!(other_hash, &block)
       self
     end
 
-    ##
-    # :method: deep_merge
-    # :call-seq: deep_merge(other_hash, &block)
-    #
-    # Returns a new +ActionController::Parameters+ instance with +self+ and +other_hash+ merged recursively.
-    #
-    # Like with +Hash#merge+ in the standard library, a block can be provided
-    # to merge values.
-    #
-    #--
-    # Implemented by ActiveSupport::DeepMergeable#deep_merge.
-
-    ##
-    # :method: deep_merge!
-    # :call-seq: deep_merge!(other_hash, &block)
-    #
-    # Same as +#deep_merge+, but modifies +self+.
-    #
-    #--
-    # Implemented by ActiveSupport::DeepMergeable#deep_merge!.
-
-    def deep_merge?(other_hash) # :nodoc
+    def deep_merge?(other_hash) # :nodoc:
       other_hash.is_a?(ActiveSupport::DeepMergeable)
     end