diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
index 397738dd98d5f137bab30e53a0584f1599e5bb33..9186855319a0780a7b4b6e96d7d5140bdd066620 100644
--- a/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -134,7 +134,7 @@ def capture(*args)
       #
       #   <%#  Add some other content, or use a different template: %>
       #
-      #   <% content_for :navigation, true do %>
+      #   <% content_for :navigation, flush: true do %>
       #     <li><%= link_to 'Login', :action => 'login' %></li>
       #   <% end %>
       #
@@ -148,14 +148,14 @@ def capture(*args)
       #
       # WARNING: content_for is ignored in caches. So you shouldn't use it
       # for elements that will be fragment cached.
-      def content_for(name, content = nil, flush = false, &block)
+      def content_for(name, content = nil, options = {}, &block)
         if content || block_given?
           if block_given?
-            flush = content if content
+            options = content if content
             content = capture(&block)
           end
           if content
-            flush ? @view_flow.set(name, content) : @view_flow.append(name, content)
+            options[:flush] ? @view_flow.set(name, content) : @view_flow.append(name, content)
           end
           nil
         else
diff --git a/actionpack/test/template/capture_helper_test.rb b/actionpack/test/template/capture_helper_test.rb
index 17469f8c3e5f1c052876f6fab6c62a1e9477fb70..234ac3252dbde20aa3b14fa70a3db9114d2c9b80 100644
--- a/actionpack/test/template/capture_helper_test.rb
+++ b/actionpack/test/template/capture_helper_test.rb
@@ -56,7 +56,7 @@ def test_content_for_with_multiple_calls
   def test_content_for_with_multiple_calls_and_flush
     assert ! content_for?(:title)
     content_for :title, 'foo'
-    content_for :title, 'bar', true
+    content_for :title, 'bar', flush: true
     assert_equal 'bar', content_for(:title)
   end
 
@@ -75,7 +75,7 @@ def test_content_for_with_block_and_multiple_calls_with_flush
     content_for :title do
       'foo'
     end
-    content_for :title, true do
+    content_for :title, flush: true do
       'bar'
     end
     assert_equal 'bar', content_for(:title)
@@ -86,7 +86,7 @@ def test_content_for_with_block_and_multiple_calls_with_flush_nil_content
     content_for :title do
       'foo'
     end
-    content_for :title, nil, true do
+    content_for :title, nil, flush: true do
       'bar'
     end
     assert_equal 'bar', content_for(:title)
@@ -97,7 +97,7 @@ def test_content_for_with_block_and_multiple_calls_without_flush
     content_for :title do
       'foo'
     end
-    content_for :title, false do
+    content_for :title, flush: false do
       'bar'
     end
     assert_equal 'foobar', content_for(:title)
@@ -117,11 +117,11 @@ def test_content_for_with_whitespace_block
   def test_content_for_with_whitespace_block_and_flush
     assert ! content_for?(:title)
     content_for :title, 'foo'
-    content_for :title, true do
+    content_for :title, flush: true do
       output_buffer << "  \n  "
       nil
     end
-    content_for :title, 'bar', true
+    content_for :title, 'bar', flush: true
     assert_equal 'bar', content_for(:title)
   end
 
@@ -131,9 +131,9 @@ def test_content_for_returns_nil_when_writing
     assert_equal nil, content_for(:title) { output_buffer << 'bar'; nil }
     assert_equal nil, content_for(:title) { output_buffer << "  \n  "; nil }
     assert_equal 'foobar', content_for(:title)
-    assert_equal nil, content_for(:title, 'foo', true)
-    assert_equal nil, content_for(:title, true) { output_buffer << 'bar'; nil }
-    assert_equal nil, content_for(:title, true) { output_buffer << "  \n  "; nil }
+    assert_equal nil, content_for(:title, 'foo', flush: true)
+    assert_equal nil, content_for(:title, flush: true) { output_buffer << 'bar'; nil }
+    assert_equal nil, content_for(:title, flush: true) { output_buffer << "  \n  "; nil }
     assert_equal 'bar', content_for(:title)
   end