aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGodfrey Chan <godfreykfc@gmail.com>2014-07-16 22:58:15 -0700
committerGodfrey Chan <godfreykfc@gmail.com>2014-07-16 22:58:15 -0700
commitb062d5d9671de59490dffd0ff18f650e22528756 (patch)
tree310f8a56b137cd7df7e20baec5cc9cef8358f19d
parentc6a97b8d4d07b430d821f0ede0df32da30a210b8 (diff)
parentf5d79d765043e4fabfae977fa8884162839fc01c (diff)
downloadrails-b062d5d9671de59490dffd0ff18f650e22528756.tar.gz
rails-b062d5d9671de59490dffd0ff18f650e22528756.tar.bz2
rails-b062d5d9671de59490dffd0ff18f650e22528756.zip
Merge pull request #16201 from noinkling/master
Fix broken list formatting in API docs [ci skip]
-rw-r--r--actionview/lib/action_view/helpers/rendering_helper.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/actionview/lib/action_view/helpers/rendering_helper.rb b/actionview/lib/action_view/helpers/rendering_helper.rb
index ebfc35a4c7..6cd6e858dd 100644
--- a/actionview/lib/action_view/helpers/rendering_helper.rb
+++ b/actionview/lib/action_view/helpers/rendering_helper.rb
@@ -13,13 +13,13 @@ module ActionView
# * <tt>:inline</tt> - Renders an inline template similar to how it's done in the controller.
# * <tt>:text</tt> - Renders the text passed in out.
# * <tt>:plain</tt> - Renders the text passed in out. Setting the content
- # type as <tt>text/plain</tt>.
+ # type as <tt>text/plain</tt>.
# * <tt>:html</tt> - Renders the html safe string passed in out, otherwise
- # performs html escape on the string first. Setting the content type as
- # <tt>text/html</tt>.
+ # performs html escape on the string first. Setting the content type as
+ # <tt>text/html</tt>.
# * <tt>:body</tt> - Renders the text passed in, and inherits the content
- # type of <tt>text/html</tt> from <tt>ActionDispatch::Response</tt>
- # object.
+ # type of <tt>text/html</tt> from <tt>ActionDispatch::Response</tt>
+ # object.
#
# If no options hash is passed or :update specified, the default is to render a partial and use the second parameter
# as the locals hash.