aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-02-08 03:47:31 -0800
committerSantiago Pastorino <santiago@wyeworks.com>2012-02-08 03:47:31 -0800
commit17497e5c557ce49f9fbaebf9a290b2a9fa216b8a (patch)
treed4fcb5e8429f5d4247b7e16c14f480be297d1136
parent75ffd8701d04d943eddcafee08e19b90bce8936c (diff)
parentb12cfd523c426674998004ba13bc94dac8a91c65 (diff)
downloadrails-17497e5c557ce49f9fbaebf9a290b2a9fa216b8a.tar.gz
rails-17497e5c557ce49f9fbaebf9a290b2a9fa216b8a.tar.bz2
rails-17497e5c557ce49f9fbaebf9a290b2a9fa216b8a.zip
Merge pull request #4934 from rafaelfranca/fix-doc
Fix match docs
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index ae67b71a27..cf9c0d7b6a 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1250,7 +1250,7 @@ module ActionDispatch
end
# match 'path' => 'controller#action'
- # match 'path', as: 'controller#action'
+ # match 'path', to: 'controller#action'
# match 'path', 'otherpath', on: :member, via: :get
def match(path, *rest)
if rest.empty? && Hash === path