diff options
| author | Marcel Molina <marcel@vernix.org> | 2007-05-26 20:29:05 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2007-05-26 20:29:05 +0000 |
| commit | 404a357013f6a544692841770b03a1ccf0b57ea7 (patch) | |
| tree | c7988111142c28e9b34e95f1b0679035734a4c21 /actionpack | |
| parent | dcaa074abf5691a933b9c55159cc7d98a02b3b2f (diff) | |
| download | rails-404a357013f6a544692841770b03a1ccf0b57ea7.tar.gz rails-404a357013f6a544692841770b03a1ccf0b57ea7.tar.bz2 rails-404a357013f6a544692841770b03a1ccf0b57ea7.zip | |
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
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/routing.rb | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 356c88a42a..26c77a5ecb 100644 --- a/actionpack/CHANGELOG +++ b/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] diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 4a1eda82bf..34041cc0fc 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/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 # |