diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 9e1aac05ee09dc709d0ebfbfb43e574563afb8d9..a385b96a621084efaca808159c420586687f3853 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 354c1ab8865810693b270b8fd5d6e5505edb2b7d..67e8266e92d51b9bf16a0053bb5ba089ea83a172 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.