diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-12 19:10:49 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-12 19:10:49 +0530 |
| commit | 70237e7dd3dde34dd4b7849619457bcb214ff674 (patch) | |
| tree | 660564946242a4307621b0ff397a87a0add398e2 /activesupport/lib/active_support/core_ext/string/output_safety.rb | |
| parent | f2f6534272b7895aa39183890043bc8c8e0ee1e8 (diff) | |
| parent | 84d198b4a0846ae74ff49001adaa7c3c80bc0607 (diff) | |
| download | rails-70237e7dd3dde34dd4b7849619457bcb214ff674.tar.gz rails-70237e7dd3dde34dd4b7849619457bcb214ff674.tar.bz2 rails-70237e7dd3dde34dd4b7849619457bcb214ff674.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activesupport/lib/active_support/callbacks.rb
Diffstat (limited to 'activesupport/lib/active_support/core_ext/string/output_safety.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/output_safety.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb index 215ba87ca9..6bda970e40 100644 --- a/activesupport/lib/active_support/core_ext/string/output_safety.rb +++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb @@ -14,7 +14,6 @@ class ERB # In your ERB templates, use this method to escape any unsafe content. For example: # <%=h @person.name %> # - # ==== Example: # puts html_escape('is a > 0 & a < 10?') # # => is a > 0 & a < 10? def html_escape(s) @@ -37,7 +36,6 @@ class ERB # A utility method for escaping HTML without affecting existing escaped entities. # - # ==== Examples # html_escape_once('1 < 2 & 3') # # => "1 < 2 & 3" # |