diff options
| author | Matthew Draper <matthew@trebex.net> | 2018-01-12 16:00:37 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-12 16:00:37 +1030 |
| commit | 3387676efdd03fd6e5b9a70b215ce02cdb1d4ee1 (patch) | |
| tree | 27aefe2ae980b59ae2fad98c594b137fa8bfbcfe /actionpack | |
| parent | c09ebcf4a9d708de05025f669c4e6f018c0b3be5 (diff) | |
| parent | 49542ae88697fd708a76c48f6a8c3bcde4591df2 (diff) | |
| download | rails-3387676efdd03fd6e5b9a70b215ce02cdb1d4ee1.tar.gz rails-3387676efdd03fd6e5b9a70b215ce02cdb1d4ee1.tar.bz2 rails-3387676efdd03fd6e5b9a70b215ce02cdb1d4ee1.zip | |
Merge pull request #31682 from jameslovejoy/fix-rdoc-typos-documentation
Fix typos, update documentation
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal/force_ssl.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb index 0ba1f9f783..7de500d119 100644 --- a/actionpack/lib/action_controller/metal/force_ssl.rb +++ b/actionpack/lib/action_controller/metal/force_ssl.rb @@ -39,7 +39,7 @@ module ActionController # end # # ==== URL Options - # You can pass any of the following options to affect the redirect url + # You can pass any of the following options to affect the redirect URL # * <tt>host</tt> - Redirect to a different host name # * <tt>subdomain</tt> - Redirect to a different subdomain # * <tt>domain</tt> - Redirect to a different domain @@ -73,7 +73,7 @@ module ActionController # Redirect the existing request to use the HTTPS protocol. # # ==== Parameters - # * <tt>host_or_options</tt> - Either a host name or any of the url and + # * <tt>host_or_options</tt> - Either a host name or any of the URL and # redirect options available to the <tt>force_ssl</tt> method. def force_ssl_redirect(host_or_options = nil) unless request.ssl? |