diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-19 19:36:48 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-19 19:36:48 +0530 |
| commit | 1551de3c04bf872423683926f92916abe2a49ad1 (patch) | |
| tree | 156daec67fc0305f7723ddc8f157523b50b1d758 /actionpack | |
| parent | 71a83a9cfde71293abcebd98e874f317aa83160e (diff) | |
| parent | 4adfd8e68db88e08ea39c05a14a3375651f058d3 (diff) | |
| download | rails-1551de3c04bf872423683926f92916abe2a49ad1.tar.gz rails-1551de3c04bf872423683926f92916abe2a49ad1.tar.bz2 rails-1551de3c04bf872423683926f92916abe2a49ad1.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index 54a65ce5f8..8cd7cf0052 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -208,13 +208,16 @@ module ActionView # # ==== Options # * <tt>:sanitize</tt> - If +false+, does not sanitize +text+. - # * <tt>:wrapper_tag</tt> - String representing the tag wrapper, defaults to <tt>"p"</tt> + # * <tt>:wrapper_tag</tt> - String representing the wrapper tag, defaults to <tt>"p"</tt> # # ==== Examples # my_text = "Here is some basic text...\n...with a line break." # # simple_format(my_text) # # => "<p>Here is some basic text...\n<br />...with a line break.</p>" + # + # simple_format(my_text, {}, :wrapper_tag => "div") + # # => "<div>Here is some basic text...\n<br />...with a line break.</div>" # # more_text = "We want to put a paragraph...\n\n...right there." # |