aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorGodfrey Chan <godfreykfc@gmail.com>2013-12-16 22:08:58 -0800
committerGodfrey Chan <godfreykfc@gmail.com>2013-12-17 08:39:07 -0800
commit2003d0409e357c7be8a9380f479d8094efc47d31 (patch)
tree3cfed40e2b69fbed787472c0ba1d4280a7c54e0e /actionpack
parent5d77edf0cf1ed653ed3f7729d77eeb8de219d0b3 (diff)
downloadrails-2003d0409e357c7be8a9380f479d8094efc47d31.tar.gz
rails-2003d0409e357c7be8a9380f479d8094efc47d31.tar.bz2
rails-2003d0409e357c7be8a9380f479d8094efc47d31.zip
Some assorted fixes for the 4.1 release notes:
* Added release notes for secrets.yml and mentioned it in the highlights * Added release notes for Mailer previews and mentioned it in the highlights * Added release notes for Module#concerning * Removed mention for AV extraction from the highlights * Rearranged the major features to put highlighted features first * Various improvements and typo fixes [ci skip]
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/metal/mime_responds.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 60fababd83..fbc4024c2d 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -184,7 +184,7 @@ module ActionController #:nodoc:
# Formats can have different variants.
#
# The request variant is a specialization of the request format, like <tt>:tablet</tt>,
- # <tt>:phone</tt>, or <tt>:desktop<tt>.
+ # <tt>:phone</tt>, or <tt>:desktop</tt>.
#
# We often want to render different html/json/xml templates for phones,
# tablets, and desktop browsers. Variants make it easy.