diff options
| author | Xavier Noria <fxn@hashref.com> | 2008-05-05 22:39:55 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2008-05-05 22:39:55 +0200 |
| commit | bc3aa6b65b0e1767faa02832a8b7aa0243ab725f (patch) | |
| tree | 5d09411d018a59312b65c600918d56534c2246cc /actionmailer | |
| parent | 9482da621390c874da7c921c8bd6230caae7035a (diff) | |
| download | rails-bc3aa6b65b0e1767faa02832a8b7aa0243ab725f.tar.gz rails-bc3aa6b65b0e1767faa02832a8b7aa0243ab725f.tar.bz2 rails-bc3aa6b65b0e1767faa02832a8b7aa0243ab725f.zip | |
revised convention for lists in action_mailer/base.rb
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 48e877a182..3299d881bd 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -204,22 +204,23 @@ module ActionMailer #:nodoc: # Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers. # # * <tt>smtp_settings</tt> - Allows detailed configuration for <tt>:smtp</tt> delivery method: - # * <tt>:address</tt> Allows you to use a remote mail server. Just change it from its default "localhost" setting. - # * <tt>:port</tt> On the off chance that your mail server doesn't run on port 25, you can change it. - # * <tt>:domain</tt> If you need to specify a HELO domain, you can do it here. - # * <tt>:user_name</tt> If your mail server requires authentication, set the username in this setting. - # * <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. + # * <tt>:address</tt> - Allows you to use a remote mail server. Just change it from its default "localhost" setting. + # * <tt>:port</tt> - On the off chance that your mail server doesn't run on port 25, you can change it. + # * <tt>:domain</tt> - If you need to specify a HELO domain, you can do it here. + # * <tt>:user_name</tt> - If your mail server requires authentication, set the username in this setting. + # * <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> # # * <tt>sendmail_settings</tt> - Allows you to override options for the <tt>:sendmail</tt> delivery method - # * <tt>:location</tt> The location of the sendmail executable, defaults to "/usr/sbin/sendmail" - # * <tt>:arguments</tt> The command line arguments - # * <tt>raise_delivery_errors</tt> - whether or not errors should be raised if the email fails to be delivered. + # * <tt>:location</tt> - The location of the sendmail executable, defaults to "/usr/sbin/sendmail" + # * <tt>:arguments</tt> - The command line arguments + # + # * <tt>raise_delivery_errors</tt> - Whether or not errors should be raised if the email fails to be delivered. # # * <tt>delivery_method</tt> - Defines a delivery method. Possible values are <tt>:smtp</tt> (default), <tt>:sendmail</tt>, and <tt>:test</tt>. # - # * <tt>perform_deliveries</tt> - Determines whether deliver_* methods are actually carried out. By default they are, + # * <tt>perform_deliveries</tt> - Determines whether <tt>deliver_*</tt> methods are actually carried out. By default they are, # but this can be turned off to help functional testing. # # * <tt>deliveries</tt> - Keeps an array of all the emails sent out through the Action Mailer with <tt>delivery_method :test</tt>. Most useful |