2 files changed, 9 insertions, 5 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 5fb742157c..50d3abd2fb 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -435,10 +435,8 @@ module ActionView
 
         builder = options[:parent_builder] = instantiate_builder(object_name, object, options)
         fields_for = fields_for(object_name, object, options, &proc)
-        default_options = builder.multipart? ? { multipart: true } : {}
-        default_options.merge!(options.delete(:html))
-
-        form_tag(options.delete(:url) || {}, default_options) { fields_for }
+        default_options = builder.form_tag_attributes
+        form_tag(options[:url] || {}, default_options) { fields_for }
       end
 
       def apply_form_for_options!(record, object, options) #:nodoc:
@@ -1201,6 +1199,7 @@ module ActionView
 
         @nested_child_index = {}
         @object_name, @object, @template, @options = object_name, object, template, options
+        @form_tag_attributes = options.fetch(:html, {})
         @parent_builder = options[:parent_builder]
         @default_options = @options ? @options.slice(:index, :namespace) : {}
         if @object_name.to_s.match(/\[\]$/)
@@ -1214,6 +1213,11 @@ module ActionView
         @index = options[:index] || options[:child_index]
       end
 
+      def form_tag_attributes
+        options = multipart? ? { multipart: true } : {}
+        options.merge! @form_tag_attributes
+      end
+
       (field_helpers - [:label, :check_box, :radio_button, :fields_for, :hidden_field, :file_field]).each do |selector|
         class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
           def #{selector}(method, options = {})  # def text_field(method, options = {})
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index ff83ef3ca1..479739bebd 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -184,7 +184,7 @@ module ActionView
       #   # => <label for="name">Name</label>
       #
       #   label_tag 'name', 'Your name'
-      #   # => <label for="name">Your Name</label>
+      #   # => <label for="name">Your name</label>
       #
       #   label_tag 'name', nil, class: 'small_label'
       #   # => <label for="name" class="small_label">Name</label>