Merge branch 'master' of git://github.com/rails/rails into old

1 files changed, 3 insertions, 3 deletions

diff --git a/actionpack/examples/very_simple.rb b/actionpack/examples/very_simple.rb
index 8d01cb39bd..422c4c3298 100644
--- a/actionpack/examples/very_simple.rb
+++ b/actionpack/examples/very_simple.rb
@@ -3,7 +3,7 @@ $:.push "rails/actionpack/lib"
 
 require "action_controller"
 
-class Kaigi < ActionController::Http
+class Kaigi < ActionController::Metal
   include AbstractController::Callbacks
   include ActionController::RackConvenience
   include ActionController::Renderer
@@ -13,7 +13,7 @@ class Kaigi < ActionController::Http
   before_filter :set_name
   append_view_path "views"
   
-  def _action_view
+  def view_context
     self
   end
   
@@ -23,7 +23,7 @@ class Kaigi < ActionController::Http
 
   DEFAULT_LAYOUT = Object.new.tap {|l| def l.render(*) yield end }
   
-  def _render_template_from_controller(template, layout = DEFAULT_LAYOUT, options = {}, partial = false)
+  def render_template(template, layout = DEFAULT_LAYOUT, options = {}, partial = false)
     ret = template.render(self, {})
     layout.render(self, {}) { ret }
   end