diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-10 15:03:33 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-10 15:03:33 -0300 |
| commit | ab98adadf4939f09c9cb82d6a2370efff40793e2 (patch) | |
| tree | 5ff9b9b851d917740475864845bbeadbce15b96e /actionmailer | |
| parent | 0014bc8bcc341b5430e04f425e71fa9d38e6da5a (diff) | |
| parent | 6a781b92454cc6098dd11c430cee5d586dc7023b (diff) | |
| download | rails-ab98adadf4939f09c9cb82d6a2370efff40793e2.tar.gz rails-ab98adadf4939f09c9cb82d6a2370efff40793e2.tar.bz2 rails-ab98adadf4939f09c9cb82d6a2370efff40793e2.zip | |
Merge pull request #15615 from JuanitoFatas/doc/action-mailer
[ci skip] Improve enable_starttls_auto documentation (Action Mailer).
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 5852aeaec2..18511edaf0 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -369,8 +369,8 @@ module ActionMailer # This is a symbol and one of <tt>:plain</tt> (will send the password in the clear), <tt>:login</tt> (will # send password Base64 encoded) or <tt>:cram_md5</tt> (combines a Challenge/Response mechanism to exchange # information and a cryptographic Message Digest 5 algorithm to hash important information) - # * <tt>:enable_starttls_auto</tt> - When set to true, detects if STARTTLS is enabled in your SMTP server - # and starts to use it. + # * <tt>:enable_starttls_auto</tt> - Detects if STARTTLS is enabled in your SMTP server and starts + # to use it. Defaults to <tt>true</tt>. # * <tt>:openssl_verify_mode</tt> - When using TLS, you can set how OpenSSL checks the certificate. This is # 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>, <tt>'peer'</tt>, <tt>'client_once'</tt>, |