diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-04-28 13:39:55 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-04-28 13:39:55 +0200 |
| commit | 80d068779d5dce6c21570680e2b9602c5d9145a2 (patch) | |
| tree | 09ce9b45a092c975795e638f65bfb88f715d495b /actionmailer | |
| parent | a66a64aa2a82b755f754bd42b8a4a4697ac89f83 (diff) | |
| parent | e7d2cef1f4a7ffc0fe1a5f017ee42aa2b51a5997 (diff) | |
| download | rails-80d068779d5dce6c21570680e2b9602c5d9145a2.tar.gz rails-80d068779d5dce6c21570680e2b9602c5d9145a2.tar.bz2 rails-80d068779d5dce6c21570680e2b9602c5d9145a2.zip | |
Merge pull request #19930 from axilleas/doc_smtp_plain_auth_fix
AUTH PLAIN is Base64 encoded [ci skip]
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 6ddc4c9596..754f698e48 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -379,8 +379,8 @@ module ActionMailer # * <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> (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 + # This is a symbol and one of <tt>:plain</tt> (will send the password Base64 encoded), <tt>:login</tt> (will + # send the 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> - Detects if STARTTLS is enabled in your SMTP server and starts # to use it. Defaults to <tt>true</tt>. |