Bring abstract_controller up to date with rails/master

Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list
of commits that could not be applied cleanly or are obviated with the
abstract_controller refactor. They all need to be revisited to ensure
that fixes made in 2.3 do not reappear in 3.0:

2259ecf368e6a6715966f69216e3ee86bf1a82a7
AR not available
  * This will be reimplemented with ActionORM or equivalent

06182ea02e92afad579998aa80144588e8865ac3
implicitly rendering a js response should not use the default layout
[#1844 state:resolved]
  * This will be handled generically

893e9eb99504705419ad6edac14d00e71cef5f12
Improve view rendering performance in development mode and reinstate
template recompiling in production [#1909 state:resolved]
  * We will need to reimplement rails-dev-boost on top of the refactor;
    the changes here are very implementation specific and cannot be
    cleanly applied. The following commits are implicated:

      199e750d46c04970b5e7684998d09405648ecbd4
      3942cb406e1d5db0ac00e03153809cc8dc4cc4db
      f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690
      e3b166aab37ddc2fbab030b146eb61713b91bf55
      ae9f258e03c9fd5088da12c1c6cd216cc89a01f7
      44423126c6f6133a1d9cf1d0832b527e8711d40f

0cb020b4d6d838025859bd60fb8151c8e21b8e84
workaround for picking layouts based on wrong view_paths
[#1974 state:resolved]
  * The specifics of this commit no longer apply. Since it is a two-line
    commit, we will reimplement this change.

8c5cc66a831aadb159f3daaffa4208064c30af0e
make action_controller/layouts pick templates from the current instance's
view_paths instead of the class view_paths [#1974 state:resolved]
  * This does not apply at all. It should be trivial to apply the feature
    to the reimplemented ActionController::Base.

87e8b162463f13bd50d27398f020769460a770e3
fix HTML fallback for explicit templates [#2052 state:resolved]
  * There were a number of patches related to this that simply compounded
    each other. Basically none of them apply cleanly, and the underlying
    issue needs to be revisited. After discussing the underlying problem
    with Koz, we will defer these fixes for further discussion.

1 files changed, 0 insertions, 145 deletions

diff --git a/railties/doc/guides/source/index.txt b/railties/doc/guides/source/index.txt
deleted file mode 100644
index b32d8ef7b1..0000000000
--- a/railties/doc/guides/source/index.txt
+++ /dev/null
@@ -1,145 +0,0 @@
-Ruby on Rails Guides
-====================
-
-These guides are designed to make you immediately productive with Rails, and to help you understand how all of the pieces fit together. There are two different versions of the Guides site, and you should be sure to use the one that applies to your situation:
-
-* http://guides.rubyonrails.org/[Current Release version] - based on Rails 2.2
-* http://guides.rails.info/[Edge Rails version] - based on the Rails 2.3 branch
-
-WARNING: This page is the result of ongoing http://hackfest.rubyonrails.org/guide[Rails Guides hackfest] and a work in progress.
-
-CAUTION: Guides marked with this icon are currently being worked on. While they might still be useful to you, they may contain incomplete information and even errors. You can help by reviewing them and posting your comments and corrections at the respective Lighthouse ticket.
-
-++++++++++++++++++++++++++++++++++++++
-<h2>Start Here</h2>
-++++++++++++++++++++++++++++++++++++++
-
-.link:getting_started_with_rails.html[Getting Started with Rails]
-***********************************************************
-Everything you need to know to install Rails and create your first application.
-***********************************************************
-
-++++++++++++++++++++++++++++++++++++++
-<h2>Models</h2>
-++++++++++++++++++++++++++++++++++++++
-
-.link:migrations.html[Rails Database Migrations]
-***********************************************************
-This guide covers how you can use Active Record migrations to alter your database in a structured and organized manner.
-***********************************************************
-
-.link:activerecord_validations_callbacks.html[Active Record Validations and Callbacks]
-***********************************************************
-CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/26[Lighthouse Ticket]
-
-This guide covers how you can use Active Record validations and callbacks.
-***********************************************************
-
-.link:association_basics.html[Active Record Associations]
-***********************************************************
-This guide covers all the associations provided by Active Record.
-***********************************************************
-
-.link:active_record_querying.html[Active Record Query Interface]
-***********************************************************
-CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/16[Lighthouse Ticket]
-
-This guide covers the database query interface provided by Active Record.
-***********************************************************
-
-++++++++++++++++++++++++++++++++++++++
-<h2>Views</h2>
-++++++++++++++++++++++++++++++++++++++
-
-.link:layouts_and_rendering.html[Layouts and Rendering in Rails]
-***********************************************************
-This guide covers the basic layout features of Action Controller and Action View,
-including rendering and redirecting, using +content_for+ blocks, and working
-with partials.
-***********************************************************
-
-.link:form_helpers.html[Action View Form Helpers]
-***********************************************************
-CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/1[Lighthouse Ticket]
-
-Guide to using built in Form helpers.
-***********************************************************
-
-++++++++++++++++++++++++++++++++++++++
-<h2>Controllers</h2>
-++++++++++++++++++++++++++++++++++++++
-
-.link:routing_outside_in.html[Rails Routing from the Outside In]
-***********************************************************
-This guide covers the user-facing features of Rails routing. If you want to 
-understand how to use routing in your own Rails applications, start here.
-***********************************************************
-
-.link:actioncontroller_basics.html[Basics of Action Controller]
-***********************************************************
-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.
-***********************************************************
-
-.link:caching_with_rails.html[Rails Caching]
-***********************************************************
-CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/10[Lighthouse Ticket]
-
-This guide covers the three types of caching that Rails provides by default.
-***********************************************************
-
-++++++++++++++++++++++++++++++++++++++
-<h2>Digging Deeper</h2>
-++++++++++++++++++++++++++++++++++++++
-
-.link:testing_rails_applications.html[Testing Rails Applications]
-***********************************************************
-CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/8[Lighthouse Ticket]
-
-This is a rather comprehensive guide to doing both unit and functional tests
-in Rails. It covers everything from ``What is a test?'' to the testing APIs.
-Enjoy.
-***********************************************************
-
-.link:security.html[Securing Rails Applications]
-***********************************************************
-This guide describes common security problems in web applications and how to
-avoid them with Rails.
-***********************************************************
-
-.link:debugging_rails_applications.html[Debugging Rails Applications]
-***********************************************************
-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.
-***********************************************************
-
-.link:performance_testing.html[Performance Testing Rails Applications]
-***********************************************************
-This guide covers ways to benchmark and profile your Rails application.
-***********************************************************
-
-.link:creating_plugins.html[The Basics of Creating Rails Plugins]
-***********************************************************
-This guide covers how to build a plugin to extend the functionality of Rails.
-***********************************************************
-
-.link:i18n.html[The Rails Internationalization API]
-***********************************************************
-CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/23[Lighthouse ticket]
-
-This guide introduces you to the basic concepts and features of the Rails I18n API and shows you how to localize your application.
-***********************************************************
-
-.link:configuring.html[Configuring Rails Applications]
-***********************************************************
-This guide covers the basic configuration settings for a Rails application.
-***********************************************************
-
-.link:command_line.html[Rails Command Line Tools and Rake tasks]
-***********************************************************
-This guide covers the command line tools and rake tasks provided by Rails.
-***********************************************************
-
-Authors who have contributed to complete guides are listed link:authors.html[here].
-
-This work is licensed under a link:http://creativecommons.org/licenses/by-nc-sa/3.0/[Creative Commons Attribution-Noncommercial-Share Alike 3.0  License]