Merge commit 'mainstream/master'

Conflicts:

	actionpack/lib/action_controller/response.rb
	actionpack/lib/action_controller/test_case.rb
	actionpack/lib/action_controller/url_rewriter.rb
	activerecord/lib/active_record/associations.rb
	activesupport/lib/active_support/core_ext/time/conversions.rb
	railties/doc/guides/creating_plugins/acts_as_yaffle.txt
	railties/doc/guides/creating_plugins/creating_plugins.txt
	railties/doc/guides/creating_plugins/migration_generator.txt
	railties/doc/guides/creating_plugins/odds_and_ends.txt
	railties/doc/guides/creating_plugins/preparation.txt
	railties/doc/guides/creating_plugins/string_to_squawk.txt
	railties/doc/guides/creating_plugins/view_helper.txt
	railties/doc/guides/securing_rails_applications/creating_records_directly_from_form_parameters.txt
	railties/doc/guides/testing_rails_applications/testing_rails_applications.txt

3 files changed, 6 insertions, 6 deletions

diff --git a/actionpack/lib/action_controller/response.rb b/actionpack/lib/action_controller/response.rb
index de7425230c..da352b6993 100755
--- a/actionpack/lib/action_controller/response.rb
+++ b/actionpack/lib/action_controller/response.rb
@@ -32,7 +32,7 @@ module ActionController # :nodoc:
   class AbstractResponse
     DEFAULT_HEADERS = { "Cache-Control" => "no-cache" }
     attr_accessor :request
-    
+
     # The body content (e.g. HTML) of the response, as a String.
     attr_accessor :body
     # The headers of the response, as a Hash. It maps header names to header values.
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index d0f4f3c71b..3e66947d5f 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -25,7 +25,7 @@ module ActionController
   #
   # Functional tests are written as follows:
   # 1. First, one uses the +get+, +post+, +put+, +delete+ or +head+ method to simulate
-  #    an HTTP request. 
+  #    an HTTP request.
   # 2. Then, one asserts whether the current state is as expected. "State" can be anything:
   #    the controller's HTTP response, the database contents, etc.
   #
@@ -35,11 +35,11 @@ module ActionController
   #     def test_create
   #       # Simulate a POST response with the given HTTP parameters.
   #       post(:create, :book => { :title => "Love Hina" })
-  #       
+  #
   #       # Assert that the controller tried to redirect us to
   #       # the created book's URI.
   #       assert_response :found
-  #       
+  #
   #       # Assert that the controller really put the book in the database.
   #       assert_not_nil Book.find_by_title("Love Hina")
   #     end
diff --git a/actionpack/lib/action_controller/url_rewriter.rb b/actionpack/lib/action_controller/url_rewriter.rb
index c2def7a84b..d86e2db67d 100644
--- a/actionpack/lib/action_controller/url_rewriter.rb
+++ b/actionpack/lib/action_controller/url_rewriter.rb
@@ -19,7 +19,7 @@ module ActionController
   #
   #   <%= link_to('Click here', :controller => 'users',
   #           :action => 'new', :message => 'Welcome!') %>
-  #   
+  #
   #   #=> Generates a link to: /users/new?message=Welcome%21
   #
   # link_to, and all other functions that require URL generation functionality,
@@ -74,7 +74,7 @@ module ActionController
   #
   #   class User < ActiveRecord::Base
   #     include ActionController::UrlWriter         # !!!
-  #     
+  #
   #     def name=(value)
   #       write_attribute('name', value)
   #       write_attribute('base_uri', users_path)   # !!!