aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-08-02 05:53:11 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-08-02 05:53:11 -0700
commite0b148312dab2172f5ea8389e6d656b546c4953a (patch)
tree0bc4f13e15d061b6c7e6deacb19fea9d5e5aae43 /actionpack/lib
parent0f8fe64c4e70698b75b0fb7e0566ded41a0573ec (diff)
parent65263c1b3cc8a903616fc950cdd946be167a1f59 (diff)
downloadrails-e0b148312dab2172f5ea8389e6d656b546c4953a.tar.gz
rails-e0b148312dab2172f5ea8389e6d656b546c4953a.tar.bz2
rails-e0b148312dab2172f5ea8389e6d656b546c4953a.zip
Merge pull request #11718 from rShetty/patch-4
fix a gramatical mistake
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 168ae0a529..1faecc850b 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -3,7 +3,7 @@ require "action_controller/metal/params_wrapper"
module ActionController
# Action Controllers are the core of a web request in \Rails. They are made up of one or more actions that are executed
- # on request and then either render a template or redirect to another action. An action is defined as a public method
+ # on request and then either it renders a template or redirects to another action. An action is defined as a public method
# on the controller, which will automatically be made accessible to the web-server through \Rails Routes.
#
# By default, only the ApplicationController in a \Rails application inherits from <tt>ActionController::Base</tt>. All other