aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Mathieu <42@dmathieu.com>2014-01-06 06:29:25 -0800
committerDamien Mathieu <42@dmathieu.com>2014-01-06 06:29:25 -0800
commit5a84d3eb81d8d5c24233b29276aa0a0d9f7f9cb9 (patch)
tree8468247f085341985cc39e50ecea40e183761a51
parent3a429e6b5daf11cdeb811b8019f6e193d6e13513 (diff)
parentc13eb1c727fde0e6b2c682bbeae01b70a1f84155 (diff)
downloadrails-5a84d3eb81d8d5c24233b29276aa0a0d9f7f9cb9.tar.gz
rails-5a84d3eb81d8d5c24233b29276aa0a0d9f7f9cb9.tar.bz2
rails-5a84d3eb81d8d5c24233b29276aa0a0d9f7f9cb9.zip
Merge pull request #13613 from simi/patch-1
Fix force_ssl.rb documentation. Close tt tag.
-rw-r--r--actionpack/lib/action_controller/metal/force_ssl.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb
index 7a0ede02a2..1d0a69b8e6 100644
--- a/actionpack/lib/action_controller/metal/force_ssl.rb
+++ b/actionpack/lib/action_controller/metal/force_ssl.rb
@@ -22,7 +22,7 @@ module ActionController
#
# ==== Options
# * <tt>only</tt> - The callback should be run only for this action
- # * <tt>except<tt> - The callback should be run for all actions except this action
+ # * <tt>except</tt> - The callback should be run for all actions except this action
def force_ssl(options = {})
host = options.delete(:host)
before_filter(options) do