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

Conflicts:
	actionmailer/lib/action_mailer/base.rb
	activesupport/lib/active_support/core_ext/kernel/requires.rb

2 files changed, 10 insertions, 10 deletions

diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index b760db42e2..57a24a1bd9 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -7,18 +7,18 @@ module ActionDispatch
     # Suite of assertions to test routes generated by \Rails and the handling of requests made to them.
     module RoutingAssertions
       # Asserts that the routing of the given +path+ was handled correctly and that the parsed options (given in the +expected_options+ hash)
-      # match +path+.  Basically, it asserts that \Rails recognizes the route given by +expected_options+.
+      # match +path+. Basically, it asserts that \Rails recognizes the route given by +expected_options+.
       #
-      # Pass a hash in the second argument (+path+) to specify the request method.  This is useful for routes
-      # requiring a specific HTTP method.  The hash should contain a :path with the incoming request path
+      # Pass a hash in the second argument (+path+) to specify the request method. This is useful for routes
+      # requiring a specific HTTP method. The hash should contain a :path with the incoming request path
       # and a :method containing the required HTTP verb.
       #
       #   # assert that POSTing to /items will call the create action on ItemsController
       #   assert_recognizes({:controller => 'items', :action => 'create'}, {:path => 'items', :method => :post})
       #
-      # You can also pass in +extras+ with a hash containing URL parameters that would normally be in the query string.  This can be used
-      # to assert that values in the query string string will end up in the params hash correctly.  To test query strings you must use the
-      # extras argument, appending the query string on the path directly will not work.  For example:
+      # You can also pass in +extras+ with a hash containing URL parameters that would normally be in the query string. This can be used
+      # to assert that values in the query string string will end up in the params hash correctly. To test query strings you must use the
+      # extras argument, appending the query string on the path directly will not work. For example:
       #
       #   # assert that a path of '/items/list/1?view=print' returns the correct options
       #   assert_recognizes({:controller => 'items', :action => 'list', :id => '1', :view => 'print'}, 'items/list/1', { :view => "print" })
@@ -49,7 +49,7 @@ module ActionDispatch
         assert_equal(expected_options, request.path_parameters, msg)
       end
 
-      # Asserts that the provided options can be used to generate the provided path.  This is the inverse of +assert_recognizes+.
+      # Asserts that the provided options can be used to generate the provided path. This is the inverse of +assert_recognizes+.
       # The +extras+ parameter is used to tell the request the names and values of additional request parameters that would be in
       # a query string. The +message+ parameter allows you to specify a custom error message for assertion failures.
       #
@@ -92,10 +92,10 @@ module ActionDispatch
       end
 
       # Asserts that path and options match both ways; in other words, it verifies that <tt>path</tt> generates
-      # <tt>options</tt> and then that <tt>options</tt> generates <tt>path</tt>.  This essentially combines +assert_recognizes+
+      # <tt>options</tt> and then that <tt>options</tt> generates <tt>path</tt>. This essentially combines +assert_recognizes+
       # and +assert_generates+ into one step.
       #
-      # The +extras+ hash allows you to specify options that would normally be provided as a query string to the action.  The
+      # The +extras+ hash allows you to specify options that would normally be provided as a query string to the action. The
       # +message+ parameter allows you to specify a custom error message to display upon failure.
       #
       # ==== Examples
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 7d707d03a9..9791ba58e2 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -62,7 +62,7 @@ module ActionDispatch
       #
       # The request_method is +:get+, +:post+, +:put+, +:delete+ or +:head+; the
       # parameters are +nil+, a hash, or a url-encoded or multipart string;
-      # the headers are a hash.  Keys are automatically upcased and prefixed
+      # the headers are a hash. Keys are automatically upcased and prefixed
       # with 'HTTP_' if not already.
       def xml_http_request(request_method, path, parameters = nil, headers = nil)
         headers ||= {}