aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2016-04-03 16:51:27 +0000
committerVijay Dev <vijaydev.cse@gmail.com>2016-04-03 16:51:27 +0000
commitbdcacc856641b6d2956616e393926e02b422199e (patch)
tree8fb0c5558f8ee1abc4c53ae9a52fd5cafbc3d5f4 /activesupport
parent78f188a2f8e0f2d8bdb1d9ae38acc1d47af17a9d (diff)
parentfc959d6efd9fbbe37fd4bf34abe08680f70d59fa (diff)
downloadrails-bdcacc856641b6d2956616e393926e02b422199e.tar.gz
rails-bdcacc856641b6d2956616e393926e02b422199e.tar.bz2
rails-bdcacc856641b6d2956616e393926e02b422199e.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.rb2
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 43b9fd4bf7..005ad93b08 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -250,7 +250,7 @@ end
class String
# Marks a string as trusted safe. It will be inserted into HTML with no
- # additional escaping performed. It is your responsibilty to ensure that the
+ # additional escaping performed. It is your responsibility to ensure that the
# string contains no malicious content. This method is equivalent to the
# `raw` helper in views. It is recommended that you use `sanitize` instead of
# this method. It should never be called on user input.