diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2015-09-18 12:30:41 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2015-09-18 12:30:41 +0000 |
| commit | e80b39c390c4fef3669f0341b30ae4741674f09c (patch) | |
| tree | 8db57416b23bd7681d34a4c1c602bcdffab7aae5 /activesupport | |
| parent | dcecbb4234e5b0e4751b57ce49c7afbf0775f937 (diff) | |
| parent | b3b9d9ffe59f3038b8c4d9460d0bf41e10d881d8 (diff) | |
| download | rails-e80b39c390c4fef3669f0341b30ae4741674f09c.tar.gz rails-e80b39c390c4fef3669f0341b30ae4741674f09c.tar.bz2 rails-e80b39c390c4fef3669f0341b30ae4741674f09c.zip | |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'activesupport')
| -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 c676b26b06..8b27ec4413 100644 --- a/activesupport/lib/active_support/core_ext/string/output_safety.rb +++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb @@ -86,7 +86,7 @@ class ERB # use inside HTML attributes. # # If your JSON is being used downstream for insertion into the DOM, be aware of - # whether or not it is being inserted via +html()+. Most JQuery plugins do this. + # whether or not it is being inserted via +html()+. Most jQuery plugins do this. # If that is the case, be sure to +html_escape+ or +sanitize+ any user-generated # content returned by your JSON. # |