diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-17 17:49:33 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-17 17:49:33 +0530 |
commit | 03f8a574872f1206c16720af034e4bb91930d237 (patch) | |
tree | bb4a38ffdf977296bfb90989308994e1c4c01fa6 /actionpack/lib/action_view/helpers | |
parent | 17f583b7bc004adbb1ac44f156c806df018c7365 (diff) | |
parent | 612f7fe7014294d646f4b46ed3b927f68ee76fc7 (diff) | |
download | rails-03f8a574872f1206c16720af034e4bb91930d237.tar.gz rails-03f8a574872f1206c16720af034e4bb91930d237.tar.bz2 rails-03f8a574872f1206c16720af034e4bb91930d237.zip |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activerecord/lib/active_record/core.rb
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index fae1e44a8f..67117077dc 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -199,17 +199,19 @@ module ActionView # # => Once upon a time # # word_wrap('Once upon a time, in a kingdom called Far Far Away, a king fell ill, and finding a successor to the throne turned out to be more trouble than anyone could have imagined...') - # # => Once upon a time, in a kingdom called Far Far Away, a king fell ill, and finding\n a successor to the throne turned out to be more trouble than anyone could have\n imagined... + # # => Once upon a time, in a kingdom called Far Far Away, a king fell ill, and finding\na successor to the throne turned out to be more trouble than anyone could have\nimagined... # # word_wrap('Once upon a time', :line_width => 8) - # # => Once upon\na time + # # => Once\nupon a\ntime # # word_wrap('Once upon a time', :line_width => 1) # # => Once\nupon\na\ntime # # You can still use <tt>word_wrap</tt> with the old API that accepts the # +line_width+ as its optional second parameter: - # word_wrap('Once upon a time', 8) # => Once upon\na time + # + # word_wrap('Once upon a time', 8) + # # => Once\nupon a\ntime def word_wrap(text, *args) options = args.extract_options! unless args.blank? |