diff options
author | Xavier Noria <fxn@hashref.com> | 2011-04-03 22:22:03 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-04-03 22:22:03 +0200 |
commit | 3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d (patch) | |
tree | 31698977fbf077d079c70e5b258abc87042b5346 /activesupport | |
parent | a000fc58b8bc288ca9c60566afc1e1943f5d6083 (diff) | |
parent | 4c323bc25a69ba8fd8b080775335184fe6868747 (diff) | |
download | rails-3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d.tar.gz rails-3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d.tar.bz2 rails-3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d.zip |
Merge branch 'master' of git://github.com/lifo/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 addd4dab95..c27cbc37c5 100644 --- a/activesupport/lib/active_support/core_ext/string/output_safety.rb +++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb @@ -9,7 +9,7 @@ class ERB # A utility method for escaping HTML tag characters. # This method is also aliased as <tt>h</tt>. # - # In your ERb templates, use this method to escape any unsafe content. For example: + # In your ERB templates, use this method to escape any unsafe content. For example: # <%=h @person.name %> # # ==== Example: |