aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanito Fatas <katehuang0320@gmail.com>2014-06-11 01:49:08 +0800
committerJuanito Fatas <katehuang0320@gmail.com>2014-06-11 01:51:06 +0800
commit6a781b92454cc6098dd11c430cee5d586dc7023b (patch)
tree0e99e75dc77dc6510021b4dc73b3fa68460290c1
parent3681e1ac2c5448b9826f2e3c9b6508c50d2b4f17 (diff)
downloadrails-6a781b92454cc6098dd11c430cee5d586dc7023b.tar.gz
rails-6a781b92454cc6098dd11c430cee5d586dc7023b.tar.bz2
rails-6a781b92454cc6098dd11c430cee5d586dc7023b.zip
[ci skip] Improve enable_starttls_auto documentation.
-rw-r--r--actionmailer/lib/action_mailer/base.rb4
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>,