Merge commit 'origin/master' into savepoints

Conflicts:
	activerecord/lib/active_record/fixtures.rb
	activerecord/test/cases/defaults_test.rb

1 files changed, 2 insertions, 18 deletions

diff --git a/railties/doc/guides/html/index.html b/railties/doc/guides/html/index.html
index 306257678b..991b10c7e8 100644
--- a/railties/doc/guides/html/index.html
+++ b/railties/doc/guides/html/index.html
@@ -250,7 +250,7 @@ ul#navMain {
 <div class="sidebar-content">

 <div class="sidebar-title"><a href="layouts_and_rendering.html">Layouts and Rendering in Rails</a></div>

 <div class="para"><p>This guide covers the basic layout features of Action Controller and Action View,

-including rendering and redirecting, using +content_for_ blocks, and working

+including rendering and redirecting, using <tt>content_for</tt> blocks, and working

 with partials.</p></div>

 </div></div>

 <div class="sidebarblock">

@@ -276,14 +276,6 @@ understand how to use routing in your own Rails applications, start here.</p></d
 <div class="sidebarblock">

 <div class="sidebar-content">

 <div class="sidebar-title"><a href="actioncontroller_basics.html">Basics of Action Controller</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/17">Lighthouse Ticket</a></td>

-</tr></table>

-</div>

 <div class="para"><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>

 <div class="sidebarblock">

@@ -318,20 +310,12 @@ Enjoy.</p></div>
 <div class="sidebarblock">

 <div class="sidebar-content">

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

-<div class="para"><p>This manual describes common security problems in web applications and how to

+<div class="para"><p>This guide describes common security problems in web applications and how to

 avoid them with Rails.</p></div>

 </div></div>

 <div class="sidebarblock">

 <div class="sidebar-content">

 <div class="sidebar-title"><a href="debugging_rails_applications.html">Debugging Rails Applications</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/5">Lighthouse Ticket</a></td>

-</tr></table>

-</div>

 <div class="para"><p>This guide describes how to debug Rails applications. It covers the different

 ways of achieving this and how to understand what is happening "behind the scenes"

 of your code.</p></div>