Merge branch 'master' of git@github.com:lifo/docrails

1 files changed, 7 insertions, 0 deletions

diff --git a/railties/doc/guides/html/action_mailer_basics.html b/railties/doc/guides/html/action_mailer_basics.html
index c59012ec22..317f135e4c 100644
--- a/railties/doc/guides/html/action_mailer_basics.html
+++ b/railties/doc/guides/html/action_mailer_basics.html
@@ -53,6 +53,9 @@
           <li>
           <a href="#_epilogue">Epilogue</a>
           </li>
+          <li>
+          <a href="#_changelog">Changelog</a>
+          </li>
       </ol>
     </div>
     
@@ -220,6 +223,10 @@ http://www.gnu.org/software/src-highlite -->
 <div class="sectionbody">

 <div class="paragraph"><p>This guide presented how to create a mailer and how to test it. In reality, you may find that writing your tests before you actually write your code to be a rewarding experience. It may take some time to get used to TDD (Test Driven Development), but coding this way achieves two major benefits. Firstly, you know that the code does indeed work, because the tests fail (because there&#8217;s no code), then they pass, because the code that satisfies the tests was written. Secondly, when you start with the tests, you don&#8217;t have to make time AFTER you write the code, to write the tests, then never get around to it. The tests are already there and testing has now become part of your coding regimen.</p></div>

 </div>

+<h2 id="_changelog">5. Changelog</h2>

+<div class="sectionbody">

+<div class="paragraph"><p><a href="http://rails.lighthouseapp.com/projects/16213/tickets/25">Lighthouse ticket</a></p></div>

+</div>

 
     </div>
   </div>