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

1 files changed, 5 insertions, 5 deletions

diff --git a/railties/doc/guides/html/index.html b/railties/doc/guides/html/index.html
index d7079c9393..16ce603cec 100644
--- a/railties/doc/guides/html/index.html
+++ b/railties/doc/guides/html/index.html
@@ -136,20 +136,20 @@ understand how to use routing in your own Rails applications, start here.</p></d
 <div class="sidebar-title"><a href="actioncontroller_basics.html">Basics of Action Controller</a></div>

 <div class="paragraph"><p>This guide covers how controllers work and how they fit into the request cycle in your application. It includes sessions, filters, and cookies, data streaming, and dealing with exceptions raised by a request, among other topics.</p></div>

 </div></div>

+<h2>Digging Deeper</h2>

 <div class="sidebarblock">

 <div class="sidebar-content">

-<div class="sidebar-title"><a href="caching_with_rails.html">Rails Caching</a></div>

+<div class="sidebar-title"><a href="action_mailer_basics.html">Action Mailer Basics</a></div>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

 <img src="./images/icons/caution.png" alt="Caution" />

 </td>

-<td class="content"><a href="http://rails.lighthouseapp.com/projects/16213/tickets/10">Lighthouse Ticket</a></td>

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

 </tr></table>

 </div>

-<div class="paragraph"><p>This guide covers the three types of caching that Rails provides by default.</p></div>

+<div class="paragraph"><p>This guide describes how to use Action Mailer to send and receive emails.</p></div>

 </div></div>

-<h2>Digging Deeper</h2>

 <div class="sidebarblock">

 <div class="sidebar-content">

 <div class="sidebar-title"><a href="testing_rails_applications.html">Testing Rails Applications</a></div>

@@ -212,7 +212,7 @@ of your code.</p></div>
 <div class="paragraph"><p>This guide covers the command line tools and rake tasks provided by Rails.</p></div>

 </div></div>

 <div class="paragraph"><p>Authors who have contributed to complete guides are listed <a href="authors.html">here</a>.</p></div>

-<div class="paragraph"><p>This work is licensed under a <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-Noncommercial-Share Alike 3.0  License</a></p></div>

+<div class="paragraph"><p>This work is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0">Creative Commons Attribution-Share Alike 3.0 License</a></p></div>

 </div>

 </div>