Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

Merge branch 'master' of into pete…

  • Loading branch information...
2 parents 6308f1f + 5a898e1 commit f07ff29ea9347b0320181b6c4d4ee8f665f11554 @asanghi asanghi committed
Showing with 3 additions and 1 deletion.
  1. +3 −1 actionmailer/lib/action_mailer/base.rb
4 actionmailer/lib/action_mailer/base.rb
@@ -290,7 +290,9 @@ module ActionMailer #:nodoc:
# * <tt>:password</tt> - If your mail server requires authentication, set the password in this setting.
# * <tt>:authentication</tt> - If your mail server requires authentication, you need to specify the
# authentication type here.
- # This is a symbol and one of <tt>:plain</tt>, <tt>:login</tt>, <tt>:cram_md5</tt>.
+ # 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.

0 comments on commit f07ff29

Please sign in to comment.
Something went wrong with that request. Please try again.