1 files changed, 23 insertions, 2 deletions
diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
index e1ff49cd60..2eaee158ff 100644
--- a/railties/guides/source/action_mailer_basics.textile
+++ b/railties/guides/source/action_mailer_basics.textile
@@ -284,16 +284,37 @@ class UserMailer < ActionMailer::Base
     @user = user
     @url  = "http://example.com/login"
     mail(:to => user.email,
+         :subject => "Welcome to My Awesome Site",
+         :template_path => 'notifications',
+         :template_name => 'another')
+    end
+  end
+
+end
+</ruby>
+
+In this case it will look for templates at +app/views/notifications+ with name +another+.
+
+If you want more flexibility you can also pass a block and render specific templates or even render inline or text without using a template file:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  default :from => "notifications@example.com"
+
+  def welcome_email(user)
+    @user = user
+    @url  = "http://example.com/login"
+    mail(:to => user.email,
          :subject => "Welcome to My Awesome Site") do |format|
       format.html { render 'another_template' }
-      format.text { render 'another_template' }
+      format.text { render :text => 'Render text' }
     end
   end
 
 end
 </ruby>
 
-Will render 'another_template.text.erb' and 'another_template.html.erb'. The render command is the same one used inside of Action Controller, so you can use all the same options, such as <tt>:text</tt> etc.
+This will render the template 'another_template.html.erb' for the HTML part and use the rendered text for the text part. The render command is the same one used inside of Action Controller, so you can use all the same options, such as <tt>:text</tt>, <tt>:inline</tt> etc.
 
 h4. Action Mailer Layouts