aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/routing.rb
diff options
context:
space:
mode:
authorRyan Bigg <radarlistener@gmail.com>2008-11-18 10:40:50 +1030
committerRyan Bigg <radarlistener@gmail.com>2008-11-18 10:40:50 +1030
commit9dbb52d97e4ecc97fe793e3ac04a4fd285aa003b (patch)
treea88985f50190dad0f26044b2db0cf7b1a92355e5 /actionpack/lib/action_controller/routing.rb
parent451969f57a6dfee8537fb10d179514e011559111 (diff)
parentc62f973c749beac8947ff5119af43fbde2547eb1 (diff)
downloadrails-9dbb52d97e4ecc97fe793e3ac04a4fd285aa003b.tar.gz
rails-9dbb52d97e4ecc97fe793e3ac04a4fd285aa003b.tar.bz2
rails-9dbb52d97e4ecc97fe793e3ac04a4fd285aa003b.zip
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/routing.rb')
-rw-r--r--actionpack/lib/action_controller/routing.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index 8d51e823a6..2dcdac150a 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -84,9 +84,11 @@ module ActionController
# This sets up +blog+ as the default controller if no other is specified.
# This means visiting '/' would invoke the blog controller.
#
- # More formally, you can define defaults in a route with the <tt>:defaults</tt> key.
+ # More formally, you can include arbitrary parameters in the route, thus:
#
- # map.connect ':controller/:action/:id', :action => 'show', :defaults => { :page => 'Dashboard' }
+ # map.connect ':controller/:action/:id', :action => 'show', :page => 'Dashboard'
+ #
+ # This will pass the :page parameter to all incoming requests that match this route.
#
# Note: The default routes, as provided by the Rails generator, make all actions in every
# controller accessible via GET requests. You should consider removing them or commenting