<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -82,6 +82,17 @@ This Mailman can be the target for Postfix. In Rails, you would use the runner l
 
   ./script/runner 'Mailman.receive(STDIN.read)'
 
+== Configuration
+
+The Base class has the full list of configuration options. Here's an example:
+
+ActionMailer::Base.server_settings = {
+  :address=&gt;'smtp.yourserver.com',    # default: localhost
+  :port=&gt;'25',                        # default: 25
+  :user_name=&gt;'user',
+  :password=&gt;'pass',
+  :authentication=&gt;:plain             # :plain, :login or :cram_md5
+}
 
 == Dependencies
 </diff>
      <filename>actionmailer/README</filename>
    </modified>
    <modified>
      <diff>@@ -116,8 +116,7 @@ module ActionMailer #:nodoc:
   #   and appear last in the mime encoded message. You can also pick a different order from inside a method with
   #   &lt;tt&gt;@implicit_parts_order&lt;/tt&gt;.
   class Base
-    include ActionMailer::AdvAttrAccessor
-    include ActionMailer::PartContainer
+    include AdvAttrAccessor, PartContainer
 
     private_class_method :new #:nodoc:
 </diff>
      <filename>actionmailer/lib/action_mailer/base.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>14762fd229dfdde98bef224f198ff1ade7336b5b</id>
    </parent>
  </parents>
  <author>
    <name>David Heinemeier Hansson</name>
    <email>david@loudthinking.com</email>
  </author>
  <url>http://github.com/chriseppstein/rails/commit/0fe8e3d6c28f64cf1e35bd129595cd79a7c77091</url>
  <id>0fe8e3d6c28f64cf1e35bd129595cd79a7c77091</id>
  <committed-date>2005-07-09T10:18:01-07:00</committed-date>
  <authored-date>2005-07-09T10:18:01-07:00</authored-date>
  <message>Added a config example in README #1626 [courtenay]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1788 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
  <tree>dab6f5a53715b1a2befd961424b491eb9840bf51</tree>
  <committer>
    <name>David Heinemeier Hansson</name>
    <email>david@loudthinking.com</email>
  </committer>
</commit>
