rename ActionController::Http to ActionController::Metal at Josh's suggestion

4 files changed, 6 insertions, 6 deletions

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 32572c93c0..b6bf620ffe 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -2,7 +2,7 @@ module ActionController
   autoload :Base,                 "action_controller/base/base"
   autoload :ConditionalGet,       "action_controller/base/conditional_get"
   autoload :HideActions,          "action_controller/base/hide_actions"
-  autoload :Http,                 "action_controller/base/http"
+  autoload :Metal,                "action_controller/base/metal"
   autoload :Layouts,              "action_controller/base/layouts"
   autoload :RackConvenience,      "action_controller/base/rack_convenience"
   autoload :Rails2Compatibility,  "action_controller/base/compatibility"
diff --git a/actionpack/lib/action_controller/abstract/base.rb b/actionpack/lib/action_controller/abstract/base.rb
index ca00e66349..b93e6ce634 100644
--- a/actionpack/lib/action_controller/abstract/base.rb
+++ b/actionpack/lib/action_controller/abstract/base.rb
@@ -30,7 +30,7 @@ module AbstractController
       # instance methods on that abstract class. Public instance methods of
       # a controller would normally be considered action methods, so we
       # are removing those methods on classes declared as abstract
-      # (ActionController::Http and ActionController::Base are defined
+      # (ActionController::Metal and ActionController::Base are defined
       # as abstract)
       def internal_methods
         controller = self
diff --git a/actionpack/lib/action_controller/base/base.rb b/actionpack/lib/action_controller/base/base.rb
index e541d24e31..9d9f735e27 100644
--- a/actionpack/lib/action_controller/base/base.rb
+++ b/actionpack/lib/action_controller/base/base.rb
@@ -1,5 +1,5 @@
 module ActionController
-  class Base < Http
+  class Base < Metal
     abstract!
 
     include AbstractController::Benchmarker
diff --git a/actionpack/lib/action_controller/base/http.rb b/actionpack/lib/action_controller/base/metal.rb
index 3efd1b656f..e7d776b63e 100644
--- a/actionpack/lib/action_controller/base/http.rb
+++ b/actionpack/lib/action_controller/base/metal.rb
@@ -1,13 +1,13 @@
 require 'action_controller/abstract'
 
 module ActionController
-  # ActionController::Http provides a way to get a valid Rack application from a controller.
+  # ActionController::Metal provides a way to get a valid Rack application from a controller.
   #
   # In AbstractController, dispatching is triggered directly by calling #process on a new controller.
-  # ActionController::Http provides an #action method that returns a valid Rack application for a
+  # ActionController::Metal provides an #action method that returns a valid Rack application for a
   # given action. Other rack builders, such as Rack::Builder, Rack::URLMap, and the Rails router,
   # can dispatch directly to the action returned by FooController.action(:index).
-  class Http < AbstractController::Base
+  class Metal < AbstractController::Base
     abstract!
 
     # :api: public