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

3 files changed, 4 insertions, 4 deletions

diff --git a/config/httpd.conf-example b/config/httpd.conf-example
index dc2e4966e..8d549d363 100644
--- a/config/httpd.conf-example
+++ b/config/httpd.conf-example
@@ -16,7 +16,7 @@ RewriteEngine On
 #RewriteLog /var/log/apache2/rewrite.log
 #RewriteLogLevel 9
 
-# XXX do we need this now we use Passenger?
+# TODO: do we need this now we use Passenger?
 # Pass through the HTTP basic authentication to mongrel. See also
 # admin_http_auth_user in app/controllers/application.rb
 # Note: Apache 2 only. Doesn't work in Apache 1.3, you'll need to live without
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)/,
diff --git a/config/varnish-alaveteli.vcl b/config/varnish-alaveteli.vcl
index 5dd0ac83c..d3726682c 100644
--- a/config/varnish-alaveteli.vcl
+++ b/config/varnish-alaveteli.vcl
@@ -92,7 +92,7 @@ sub vcl_recv {
       # ban lists, see
       # http://kristianlyng.wordpress.com/2010/07/28/smart-bans-with-varnish/
 
-      # XXX in Varnish 2.x, the following would be
+      # TODO: in Varnish 2.x, the following would be
       # purge("obj.http.x-url ~ " req.url);
       ban("obj.http.x-url ~ " + req.url);
       error 200 "Banned";