Skip to content
Browse files

Fix syntax error in code example for routing documentation. #8377. […

…norbert]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6863 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent dcaa074 commit 404a357013f6a544692841770b03a1ccf0b57ea7 Marcel Molina committed
Showing with 4 additions and 3 deletions.
  1. +2 −0 actionpack/CHANGELOG
  2. +2 −3 actionpack/lib/action_controller/routing.rb
View
2 actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix syntax error in code example for routing documentation. #8377. [norbert]
+
* Routing: respond with 405 Method Not Allowed status when the route path matches but the HTTP method does not. #6953 [Josh Peek, defeated, Dan Kubb, Coda Hale]
* Add support for assert_select_rjs with :show and :hide. #7780 [dchelimsky]
View
5 actionpack/lib/action_controller/routing.rb
@@ -188,11 +188,10 @@ module ActionController
# map.geocode 'geocode/:postalcode', :controller => 'geocode',
# :action => 'show', :postalcode => /\d{5}(-\d{4})?/
#
- # or more formally:
+ # or, more formally:
#
# map.geocode 'geocode/:postalcode', :controller => 'geocode',
- # :action => 'show',
- # :requirements { :postalcode => /\d{5}(-\d{4})?/ }
+ # :action => 'show', :requirements => { :postalcode => /\d{5}(-\d{4})?/ }
#
# == Route globbing
#

0 comments on commit 404a357

Please sign in to comment.
Something went wrong with that request. Please try again.