Merge remote-tracking branch 'mysociety_github/rails-3' into rails-3use-with-alaveteli-0.11rails-3

1 files changed, 3 insertions, 8 deletions

diff --git a/lib/config/custom-routes.rb b/lib/config/custom-routes.rb
index 4184d10..5aeb7c2 100644
--- a/lib/config/custom-routes.rb
+++ b/lib/config/custom-routes.rb
@@ -1,13 +1,8 @@
 # Here you can override or add to the pages in the core website
 
-ActionController::Routing::Routes.draw do |map|
+Rails.application.routes.draw do
     # brand new controller example
-    map.with_options :controller => 'general' do |general|
-        general.mycontroller '/mycontroller', :action => 'mycontroller'
-    end    
-    
+    match '/mycontroller' => 'general#mycontroller'
     # Additional help page example
-    map.with_options :controller => 'help' do |help|
-        help.help_out '/help/help_out', :action => 'help_out'
-    end
+    match '/help/help_out' => 'help#help_out'
 end