diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-12-05 10:33:50 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-12-05 10:33:50 +0100 |
| commit | 48386d245bc169d3a36e5f305927bd968b108fea (patch) | |
| tree | 9156d3535c42e7f56af6e69fbbd5164ccb4fcc95 /actionmailer | |
| parent | b696dd70db651c6cb4a096dd0d5762416acd9917 (diff) | |
| parent | e1d0d5ae81d2b02eebb1afbfb79edf0a2da2d48e (diff) | |
| download | rails-48386d245bc169d3a36e5f305927bd968b108fea.tar.gz rails-48386d245bc169d3a36e5f305927bd968b108fea.tar.bz2 rails-48386d245bc169d3a36e5f305927bd968b108fea.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionmailer')
| -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. # |