aboutsummaryrefslogtreecommitdiffstats
path: root/guides/code/getting_started/config
diff options
context:
space:
mode:
authortwinturbo <me@broadcastingadam.com>2012-04-28 22:33:11 -0700
committertwinturbo <me@broadcastingadam.com>2012-04-28 22:33:11 -0700
commitd7532c189f26e008fc6ef50336ed5e8168b8221c (patch)
tree681436aa5d80ed5e4c9a867ccc891eab6852f124 /guides/code/getting_started/config
parent2c136ae0543ea53dcb3a3ef9372b216b54d66172 (diff)
parent6659252d9f0e6d77bee268adf587e03cfeb8f9ad (diff)
downloadrails-d7532c189f26e008fc6ef50336ed5e8168b8221c.tar.gz
rails-d7532c189f26e008fc6ef50336ed5e8168b8221c.tar.bz2
rails-d7532c189f26e008fc6ef50336ed5e8168b8221c.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'guides/code/getting_started/config')
-rw-r--r--guides/code/getting_started/config/routes.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/guides/code/getting_started/config/routes.rb b/guides/code/getting_started/config/routes.rb
index b048ac68f1..5fb85de766 100644
--- a/guides/code/getting_started/config/routes.rb
+++ b/guides/code/getting_started/config/routes.rb
@@ -1,9 +1,6 @@
Blog::Application.routes.draw do
- resources :posts do
- resources :comments
- end
- get "home/index"
+ resources :posts
# The priority is based upon order of creation:
# first created -> highest priority.
@@ -54,8 +51,8 @@ Blog::Application.routes.draw do
# You can have the root of your site routed with "root"
# just remember to delete public/index.html.
- root :to => "home#index"
-
+ root :to => "welcome#index"
+
# See how all your routes lay out with "rake routes"
# This is a legacy wild controller route that's not recommended for RESTful applications.