0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Update README to use new smtp settings configuration API. Closes #10060 [psq]
0
+
0
 * Allow ActionMailer subclasses to individually set their delivery method (so two subclasses can have different delivery methods) #10033 [zdennis]
0
 
0
 * Update TMail to v1.1.0.  Use an updated version of TMail if available.  [mikel]

0
@@ -86,7 +86,7 @@ This Mailman can be the target for Postfix. In Rails, you would use the runner l
0
 
0
 The Base class has the full list of configuration options. Here's an example:
0
 
0
-ActionMailer::Base.server_settings = {
0
+ActionMailer::Base.smtp_settings = {
0
   :address=>'smtp.yourserver.com',    # default: localhost
0
   :port=>'25',                        # default: 25
0
   :user_name=>'user',
0
@@ -142,4 +142,4 @@ And as Jim from Rake says:
0
 
0
    Feel free to submit commits or feature requests.  If you send a patch,
0
    remember to update the corresponding unit tests.  If fact, I prefer
0
-   new feature to be submitted in the form of new unit tests.
0
\ No newline at end of file
0
+   new feature to be submitted in the form of new unit tests.