diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2019-07-29 23:30:35 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-29 23:30:35 +0900 |
| commit | 79740de065e9b5ff03e9956f7e6151f6e1c03f58 (patch) | |
| tree | d832f3b55302f4ac40fa8012f00bbedba5545dca /actionmailer | |
| parent | 682f6648193a7d166d8f54be98af19c62b4e938f (diff) | |
| parent | 1480b87f3187d794e4142d4de165604d348369ec (diff) | |
| download | rails-79740de065e9b5ff03e9956f7e6151f6e1c03f58.tar.gz rails-79740de065e9b5ff03e9956f7e6151f6e1c03f58.tar.bz2 rails-79740de065e9b5ff03e9956f7e6151f6e1c03f58.zip | |
Merge pull request #36198 from oneiros/actionmailer_ssl_option
Documentation for ActionMailer's SMTP over SSL/TLS option
[ci skip]
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index eb0885953b..78264d21d1 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -408,7 +408,7 @@ module ActionMailer # really useful if you need to validate a self-signed and/or a wildcard certificate. You can use the name # of an OpenSSL verify constant (<tt>'none'</tt> or <tt>'peer'</tt>) or directly the constant # (<tt>OpenSSL::SSL::VERIFY_NONE</tt> or <tt>OpenSSL::SSL::VERIFY_PEER</tt>). - # <tt>:ssl/:tls</tt> Enables the SMTP connection to use SMTP/TLS (SMTPS: SMTP over direct TLS connection) + # * <tt>:ssl/:tls</tt> Enables the SMTP connection to use SMTP/TLS (SMTPS: SMTP over direct TLS connection) # # * <tt>sendmail_settings</tt> - Allows you to override options for the <tt>:sendmail</tt> delivery method. # * <tt>:location</tt> - The location of the sendmail executable. Defaults to <tt>/usr/sbin/sendmail</tt>. |