Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop

1 files changed, 2 insertions, 2 deletions

diff --git a/config/routes.rb b/config/routes.rb
index d9d21f0bd..7cc85c974 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,7 +16,7 @@ Alaveteli::Application.routes.draw do
     match '/blog' => 'general#blog', :as => :blog
     match '/search' => 'general#search_redirect', :as => :search_redirect
     match '/search/all' => 'general#search_redirect', :as => :search_redirect
-    # XXX combined is the search query, and then if sorted a "/newest" at the end.
+    # `combined` is the search query, and then if sorted a "/newest" at the end.
     # Couldn't find a way to do this in routes which also picked up multiple other slashes
     # and dots and other characters that can appear in search query. So we sort it all
     # out in the controller.
@@ -130,7 +130,7 @@ Alaveteli::Application.routes.draw do
     match '/:feed/list/:view' => 'track#track_list', :as => :track_list, :view => nil, :feed => /(track|feed)/
     match '/:feed/body/:url_name' => 'track#track_public_body', :as => :track_public_body, :feed => /(track|feed)/
     match '/:feed/user/:url_name' => 'track#track_user', :as => :track_user, :feed => /(track|feed)/
-    # XXX :format doesn't work. See hacky code in the controller that makes up for this.
+    # TODO: :format doesn't work. See hacky code in the controller that makes up for this.
     match '/:feed/search/:query_array' => 'track#track_search_query',
           :as => :track_search,
           :feed => /(track|feed)/,