More documentations for typos in routes. Closes #8228 [pam]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6673 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/CHANGELOG

 *SVN*
 
-* Fix documentation typo in routes. [norbert]
+* Fix documentation typo in routes. [norbert, pam]
 
 * Sweep flash when filter chain is halted. [Caio Chassot <lists@v2studio.com>]
 

actionpack/lib/action_controller/routing.rb

@@ -1279,7 +1279,7 @@ def raise_named_route_error(options, named_route, named_route_name)
         else
           required_segments = named_route.segments.select {|seg| (!seg.optional?) && (!seg.is_a?(DividerSegment)) }
           required_keys_or_values = required_segments.map { |seg| seg.key rescue seg.value } # we want either the key or the value from the segment
-          raise RoutingError, "#{named_route_name}_url failed to generate from #{options.inspect} - you may have ambiguous routes, or you may need to supply additional parameters for this route.  content_url has the following required parameters: #{required_keys_or_values.inspect} - are they all satisifed?"
+          raise RoutingError, "#{named_route_name}_url failed to generate from #{options.inspect} - you may have ambiguous routes, or you may need to supply additional parameters for this route.  content_url has the following required parameters: #{required_keys_or_values.inspect} - are they all satisfied?"
         end
       end
   

actionpack/test/controller/routing_test.rb

@@ -315,7 +315,7 @@ def test_should_have_better_error_message_when_options_diff_is_empty
     assert_match %r[:action=>"show"], exception.message
     assert_match %r[:controller=>"content"], exception.message
     assert_match %r[you may have ambiguous routes, or you may need to supply additional parameters for this route], exception.message
-    assert_match %r[content_url has the following required parameters: \["content", :query\] - are they all satisifed?], exception.message
+    assert_match %r[content_url has the following required parameters: \["content", :query\] - are they all satisfied?], exception.message
   end
   
   def test_dynamic_path_allowed