Dropped the idea of automatically routing :format for the vanilla routes -- that will be a treat for map.resources. Deprecated the name route root as it'll be used as a shortcut for map.connect '' in Rails 2.0 (Rails 1.2). Added map.root as an alias for map.connect '' (Rails 2.0)

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

1 files changed, 9 insertions, 5 deletions

diff --git a/railties/configs/routes.rb b/railties/configs/routes.rb
index 9bbc463769..0eda6de0cc 100644
--- a/railties/configs/routes.rb
+++ b/railties/configs/routes.rb
@@ -8,16 +8,20 @@ ActionController::Routing::Routes.draw do |map|
   # Sample of named route:
   # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase'
   # This route can be invoked with purchase_url(:id => product.id)
+  
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  # map.resources :products
+
+  # Sample resource route with options:
+  # map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get }
 
-  # You can have the root of your site routed by hooking up '' 
+  # You can have the root of your site routed with map.root
   # -- just remember to delete public/index.html.
-  # map.connect '', :controller => "welcome"
+  # map.root :controller => "welcome"
 
-  # Allow downloading Web Service WSDL as a file with an extension
-  # instead of a file named 'wsdl'
+  # Allow downloading Web Service WSDL as a file with an extension instead of a file named 'wsdl'
   map.connect ':controller/service.wsdl', :action => 'wsdl'
 
   # Install the default route as the lowest priority.
-  map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'
 end