Merge pull request #8455 from frodsan/actionize

Actionize: Use `_action` callbacks in documentation and code

2 files changed, 7 insertions, 7 deletions

diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb
index c38d8ccef3..f1e8714a86 100644
--- a/actionpack/lib/action_controller/metal/force_ssl.rb
+++ b/actionpack/lib/action_controller/metal/force_ssl.rb
@@ -32,14 +32,14 @@ module ActionController
       # ==== Options
       # * <tt>host</tt>   - Redirect to a different host name
       # * <tt>only</tt>   - The callback should be run only for this action
-      # * <tt>except</tt>  - The callback should be run for all actions except this action
+      # * <tt>except</tt> - The callback should be run for all actions except this action
       # * <tt>if</tt>     - A symbol naming an instance method or a proc; the callback
       #                     will be called only when it returns a true value.
       # * <tt>unless</tt> - A symbol naming an instance method or a proc; the callback
       #                     will be called only when it returns a false value.
       def force_ssl(options = {})
         host = options.delete(:host)
-        before_filter(options) do
+        before_action(options) do
           force_ssl_redirect(host)
         end
       end
diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb
index d3b5bafee1..283f6413ec 100644
--- a/actionpack/lib/action_controller/metal/http_authentication.rb
+++ b/actionpack/lib/action_controller/metal/http_authentication.rb
@@ -25,7 +25,7 @@ module ActionController
     # the regular HTML interface is protected by a session approach:
     #
     #   class ApplicationController < ActionController::Base
-    #     before_filter :set_account, :authenticate
+    #     before_action :set_account, :authenticate
     #
     #     protected
     #       def set_account
@@ -68,7 +68,7 @@ module ActionController
 
         module ClassMethods
           def http_basic_authenticate_with(options = {})
-            before_filter(options.except(:name, :password, :realm)) do
+            before_action(options.except(:name, :password, :realm)) do
               authenticate_or_request_with_http_basic(options[:realm] || "Application") do |name, password|
                 name == options[:name] && password == options[:password]
               end
@@ -124,7 +124,7 @@ module ActionController
     #     USERS = {"dhh" => "secret", #plain text password
     #              "dap" => Digest::MD5.hexdigest(["dap",REALM,"secret"].join(":"))}  #ha1 digest password
     #
-    #     before_filter :authenticate, except: [:index]
+    #     before_action :authenticate, except: [:index]
     #
     #     def index
     #       render text: "Everyone can see me!"
@@ -317,7 +317,7 @@ module ActionController
     #   class PostsController < ApplicationController
     #     TOKEN = "secret"
     #
-    #     before_filter :authenticate, except: [ :index ]
+    #     before_action :authenticate, except: [ :index ]
     #
     #     def index
     #       render text: "Everyone can see me!"
@@ -340,7 +340,7 @@ module ActionController
     # the regular HTML interface is protected by a session approach:
     #
     #   class ApplicationController < ActionController::Base
-    #     before_filter :set_account, :authenticate
+    #     before_action :set_account, :authenticate
     #
     #     protected
     #       def set_account