TeX and CSS tweaks.

Sync with latest Instiki Trunk
(Updates Rails to 1.2.2)

vendor/rails/actionpack/test/controller/flash_test.rb

@@ -35,6 +35,16 @@ class FlashTest < Test::Unit::TestCase
       render :inline => "hello"
     end
 
+    def use_flash_after_reset_session
+      flash["that"] = "hello"
+      @flashy_that = flash["that"]
+      reset_session
+      @flashy_that_reset = flash["that"]
+      flash["this"] = "good-bye"
+      @flashy_this = flash["this"]
+      render :inline => "hello"
+    end
+
     def rescue_action(e)
       raise unless ActionController::MissingTemplate === e
     end
@@ -60,7 +70,7 @@ class FlashTest < Test::Unit::TestCase
   def test_keep_flash
     get :set_flash
     
-    get :use_flash_and_keep_it
+    assert_deprecated(/keep_flash/) { get :use_flash_and_keep_it }
     assert_equal "hello", @response.template.assigns["flash_copy"]["that"]
     assert_equal "hello", @response.template.assigns["flashy"]
 
@@ -82,4 +92,11 @@ class FlashTest < Test::Unit::TestCase
     assert_nil @response.template.assigns["flash_copy"]["foo"]
     assert_nil @response.template.assigns["flashy"]
   end 
-end
+  
+  def test_flash_after_reset_session
+    get :use_flash_after_reset_session
+    assert_equal "hello",    @response.template.assigns["flashy_that"]
+    assert_equal "good-bye", @response.template.assigns["flashy_this"]
+    assert_nil   @response.template.assigns["flashy_that_reset"]
+  end 
+end