diff options
| author | Aditya Sanghi <asanghi@me.com> | 2010-11-29 21:41:48 +0530 |
|---|---|---|
| committer | Aditya Sanghi <asanghi@me.com> | 2010-11-29 21:41:48 +0530 |
| commit | f07ff29ea9347b0320181b6c4d4ee8f665f11554 (patch) | |
| tree | 1a52eda0805faaa47877c3d8896616e21245b2b1 | |
| parent | 6308f1f0fc5d85963e90787190e1164da7ac364e (diff) | |
| parent | 5a898e106a6f92ad2773a6525b0899cf906d2b3f (diff) | |
| download | rails-f07ff29ea9347b0320181b6c4d4ee8f665f11554.tar.gz rails-f07ff29ea9347b0320181b6c4d4ee8f665f11554.tar.bz2 rails-f07ff29ea9347b0320181b6c4d4ee8f665f11554.zip | |
Merge branch 'master' of https://github.com/peterb/docrails into peterb-master
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 00226148ed..840708cdc6 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/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. # |