diff options
| author | Vipul A M <vipulnsward@gmail.com> | 2016-06-27 13:50:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-27 13:50:34 -0700 |
| commit | cf8605ad28192af81af08296d4f170076362d281 (patch) | |
| tree | 7defb4d28300f1721c610bda531548b59ad54225 /actionview | |
| parent | 5ce304af9691371129d7a0c03e0e32c06f242c5e (diff) | |
| parent | a1398d11f7167ddcfbcc5c45649fd75958e4f516 (diff) | |
| download | rails-cf8605ad28192af81af08296d4f170076362d281.tar.gz rails-cf8605ad28192af81af08296d4f170076362d281.tar.bz2 rails-cf8605ad28192af81af08296d4f170076362d281.zip | |
Merge pull request #25545 from derekprior/dp-simple-format-docs
Document `simple_format` handling of `\r`
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/lib/action_view/helpers/text_helper.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/actionview/lib/action_view/helpers/text_helper.rb b/actionview/lib/action_view/helpers/text_helper.rb index 58ce042f12..fe365fafe1 100644 --- a/actionview/lib/action_view/helpers/text_helper.rb +++ b/actionview/lib/action_view/helpers/text_helper.rb @@ -269,10 +269,11 @@ module ActionView end # Returns +text+ transformed into HTML using simple formatting rules. - # Two or more consecutive newlines(<tt>\n\n</tt>) are considered as a - # paragraph and wrapped in <tt><p></tt> tags. One newline (<tt>\n</tt>) is - # considered as a linebreak and a <tt><br /></tt> tag is appended. This - # method does not remove the newlines from the +text+. + # Two or more consecutive newlines(<tt>\n\n</tt> or <tt>\r\n\r\n</tt>) are + # considered a paragraph and wrapped in <tt><p></tt> tags. One newline + # (<tt>\n</tt> or <tt>\r\n</tt>) is considered a linebreak and a + # <tt><br /></tt> tag is appended. This method does not remove the + # newlines from the +text+. # # You can pass any HTML attributes into <tt>html_options</tt>. These # will be added to all created paragraphs. |