aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal.rb
diff options
context:
space:
mode:
authorJohn Gallagher <john@synapticmishap.co.uk>2012-10-27 21:55:56 +0100
committerJohn Gallagher <john@synapticmishap.co.uk>2012-10-27 21:55:56 +0100
commit4edea9e82087f5a331a277ee4bf7b01256d11be0 (patch)
tree58164e6aa6ac19a644e590dc35d3ab98fc5a42ef /actionpack/lib/action_controller/metal.rb
parentc570ba70fe6ed53fd1ac5f30f0c9ba4cb7cd4796 (diff)
parent62f273b6501db72e3c902d947e6828dcab9c004a (diff)
downloadrails-4edea9e82087f5a331a277ee4bf7b01256d11be0.tar.gz
rails-4edea9e82087f5a331a277ee4bf7b01256d11be0.tar.bz2
rails-4edea9e82087f5a331a277ee4bf7b01256d11be0.zip
Merge branch 'master' of https://github.com/lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/metal.rb')
-rw-r--r--actionpack/lib/action_controller/metal.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index f5ab1e2350..832dec7b2a 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -5,7 +5,7 @@ module ActionController
# allowing the following syntax in controllers:
#
# class PostsController < ApplicationController
- # use AuthenticationMiddleware, :except => [:index, :show]
+ # use AuthenticationMiddleware, except: [:index, :show]
# end
#
class MiddlewareStack < ActionDispatch::MiddlewareStack #:nodoc:
@@ -56,7 +56,7 @@ module ActionController
# And then to route requests to your metal controller, you would add
# something like this to <tt>config/routes.rb</tt>:
#
- # match 'hello', :to => HelloController.action(:index)
+ # match 'hello', to: HelloController.action(:index)
#
# The +action+ method returns a valid Rack application for the \Rails
# router to dispatch to.