Added a config example in README #1626 [courtenay]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1788 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 12 insertions, 2 deletions

diff --git a/actionmailer/README b/actionmailer/README
index e0d5840c6f..8eb973668e 100755
--- a/actionmailer/README
+++ b/actionmailer/README
@@ -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=>'smtp.yourserver.com',    # default: localhost
+  :port=>'25',                        # default: 25
+  :user_name=>'user',
+  :password=>'pass',
+  :authentication=>:plain             # :plain, :login or :cram_md5
+}
 
 == Dependencies
 
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 89c202fd01..b26c11b44b 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -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
   #   <tt>@implicit_parts_order</tt>.
   class Base
-    include ActionMailer::AdvAttrAccessor
-    include ActionMailer::PartContainer
+    include AdvAttrAccessor, PartContainer
 
     private_class_method :new #:nodoc: