<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -47,7 +47,7 @@ Merb::Mailer.config = {
 }
 &lt;/code&gt;&lt;/pre&gt;  
 
-* require &quot;smtp_tls&quot;:http://www.rubyinside.com/how-to-use-gmails-smtp-server-with-rails-394.html
+* require the gem &quot;smtptls&quot;
 * Use :text option instead of :body when deliver.
 
 &lt;pre&gt;&lt;code class=&quot;ruby&quot;&gt;
@@ -153,10 +153,7 @@ end
 This will look for app/mailers/views/resource_shortage_mailer/hdd_space_shortage_detailed.html.erb for
 html and app/mailers/views/resource_shortage_mailer/hdd_space_shortage.text.erb for text.
 
-See &quot;render_mail documentation&quot;:http://merbivore.com/documentation/merb-more/0.9.3/merb-mailer/index.html?a=M000019&amp;name=render_mail
-for more examples, this method has a lot of options how you can use it.
-
-
+See Merb::MailerMixin#render_mail documentation for more examples, this method has a lot of options how you can use it.
 
 h2. Using Merb mailer to send emails outside of controllers.
 </diff>
      <filename>merb-mailer/README.textile</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>e36ab2a50e5c6648cc2cb253df662a4c608cd2ff</id>
    </parent>
  </parents>
  <author>
    <name>Yehuda Katz</name>
    <email>wycats@gmail.com</email>
  </author>
  <url>http://github.com/wycats/merb/commit/a1fe5d91b670b1183f93db35886cf0a9f6de887b</url>
  <id>a1fe5d91b670b1183f93db35886cf0a9f6de887b</id>
  <committed-date>2008-12-28T12:39:07-08:00</committed-date>
  <authored-date>2008-12-28T12:39:07-08:00</authored-date>
  <message>Fixes outdated documentation of merb_mailer</message>
  <tree>112dae3e0c08722dfe9e93ac167623558b701029</tree>
  <committer>
    <name>Yehuda Katz</name>
    <email>wycats@gmail.com</email>
  </committer>
</commit>
