diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2015-03-26 16:22:41 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2015-03-26 16:22:41 +0000 |
| commit | c26ee64b9211c92f4826fb935c615fbfa9d35821 (patch) | |
| tree | 904b671d14bb1bc57e001c8156cac76d0c51553a /activesupport/lib/active_support | |
| parent | 8635706ba370327d2ce694e9879bc8d13a14baa8 (diff) | |
| parent | 194edcf67e69f618ba4250e483ba303a8437af2a (diff) | |
| download | rails-c26ee64b9211c92f4826fb935c615fbfa9d35821.tar.gz rails-c26ee64b9211c92f4826fb935c615fbfa9d35821.tar.bz2 rails-c26ee64b9211c92f4826fb935c615fbfa9d35821.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
guides/source/4_0_release_notes.md
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/output_safety.rb | 2 |
1 files changed, 1 insertions, 1 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 bae4e206e6..c676b26b06 100644 --- a/activesupport/lib/active_support/core_ext/string/output_safety.rb +++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb @@ -13,7 +13,7 @@ class ERB # This method is also aliased as <tt>h</tt>. # # In your ERB templates, use this method to escape any unsafe content. For example: - # <%=h @person.name %> + # <%= h @person.name %> # # puts html_escape('is a > 0 & a < 10?') # # => is a > 0 & a < 10? |