Merge branch 'master' of github.com:rails/docrails

Conflicts:
	actionpack/lib/action_controller/metal/mime_responds.rb
	actionview/lib/action_view/vendor/html-scanner/html/sanitizer.rb
	activerecord/lib/active_record/type/value.rb

1 files changed, 3 insertions, 3 deletions

diff --git a/actionview/lib/action_view/helpers/output_safety_helper.rb b/actionview/lib/action_view/helpers/output_safety_helper.rb
index f03362d0f5..1c2a400245 100644
--- a/actionview/lib/action_view/helpers/output_safety_helper.rb
+++ b/actionview/lib/action_view/helpers/output_safety_helper.rb
@@ -17,10 +17,10 @@ module ActionView #:nodoc:
         stringish.to_s.html_safe
       end
 
-      # This method returns an html safe string similar to what <tt>Array#join</tt>
+      # This method returns an HTML safe string similar to what <tt>Array#join</tt>
       # would return. The array is flattened, and all items, including
-      # the supplied separator, are html escaped unless they are html
-      # safe, and the returned string is marked as html safe.
+      # the supplied separator, are HTML escaped unless they are HTML
+      # safe, and the returned string is marked as HTML safe.
       #
       #   safe_join(["<p>foo</p>".html_safe, "<p>bar</p>"], "<br />")
       #   # => "<p>foo</p>&lt;br /&gt;&lt;p&gt;bar&lt;/p&gt;"