Upgrade to Rails 2.2.0

As a side benefit, fix an (non-user-visible) bug in display_s5().
Also fixed a bug where removing orphaned pages did not expire cached summary pages.

vendor/rails/railties/lib/tasks/annotations.rake

@@ -6,18 +6,15 @@ task :notes do
 end
 
 namespace :notes do
-  desc "Enumerate all OPTIMIZE annotations"
-  task :optimize do
-    SourceAnnotationExtractor.enumerate "OPTIMIZE"
+  ["OPTIMIZE", "FIXME", "TODO"].each do |annotation|
+    desc "Enumerate all #{annotation} annotations"
+    task annotation.downcase.intern do
+      SourceAnnotationExtractor.enumerate annotation
+    end
   end
 
-  desc "Enumerate all FIXME annotations"
-  task :fixme do
-    SourceAnnotationExtractor.enumerate "FIXME"
-  end
-
-  desc "Enumerate all TODO annotations"
-  task :todo do
-    SourceAnnotationExtractor.enumerate "TODO"
+  desc "Enumerate a custom annotation, specify with ANNOTATION=WTFHAX"
+  task :custom do
+    SourceAnnotationExtractor.enumerate ENV['ANNOTATION']
   end
 end