diff options
| author | Marcel Molina <marcel@vernix.org> | 2007-11-08 03:39:15 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2007-11-08 03:39:15 +0000 |
| commit | c443a6199a9245047f8f4f114b933c785bd3fa55 (patch) | |
| tree | 7e77a482a8482121a889841e1b05d91ac1a52b36 /actionmailer | |
| parent | 7143d80147ea26c66dfa1dd4bb82f066d72f6570 (diff) | |
| download | rails-c443a6199a9245047f8f4f114b933c785bd3fa55.tar.gz rails-c443a6199a9245047f8f4f114b933c785bd3fa55.tar.bz2 rails-c443a6199a9245047f8f4f114b933c785bd3fa55.zip | |
Update README to use new smtp settings configuration API. Closes #10060 [psq]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8114 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 2 | ||||
| -rwxr-xr-x | actionmailer/README | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 9e1aac05ee..a385b96a62 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Update README to use new smtp settings configuration API. Closes #10060 [psq] + * Allow ActionMailer subclasses to individually set their delivery method (so two subclasses can have different delivery methods) #10033 [zdennis] * Update TMail to v1.1.0. Use an updated version of TMail if available. [mikel] diff --git a/actionmailer/README b/actionmailer/README index 354c1ab886..67e8266e92 100755 --- a/actionmailer/README +++ b/actionmailer/README @@ -86,7 +86,7 @@ This Mailman can be the target for Postfix. In Rails, you would use the runner l The Base class has the full list of configuration options. Here's an example: -ActionMailer::Base.server_settings = { +ActionMailer::Base.smtp_settings = { :address=>'smtp.yourserver.com', # default: localhost :port=>'25', # default: 25 :user_name=>'user', @@ -142,4 +142,4 @@ And as Jim from Rake says: Feel free to submit commits or feature requests. If you send a patch, remember to update the corresponding unit tests. If fact, I prefer - new feature to be submitted in the form of new unit tests.
\ No newline at end of file + new feature to be submitted in the form of new unit tests. |