aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-02-25 21:52:59 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-02-25 21:52:59 +0530
commit1e25d6217cfac78e0ca1c1e97c539b05dc472dd6 (patch)
treeb3959eaf6df01645d1f84472a40cbe18586d807a /actionpack
parent29054ba173c16d675545b719f018b28c6f8eef7e (diff)
parent7940976dfd545f7691b63956b067533f9c769339 (diff)
downloadrails-1e25d6217cfac78e0ca1c1e97c539b05dc472dd6.tar.gz
rails-1e25d6217cfac78e0ca1c1e97c539b05dc472dd6.tar.bz2
rails-1e25d6217cfac78e0ca1c1e97c539b05dc472dd6.zip
Merge branch 'master' of github.com:lifo/docrails
Conflicts: actionmailer/CHANGELOG.md
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/abstract_controller/base.rb2
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index 3d915cf513..43cea3b79e 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -85,7 +85,7 @@ module AbstractController
# Returns the full controller name, underscored, without the ending Controller.
# For instance, MyApp::MyPostsController would return "my_app/my_posts" for
- # controller_name.
+ # controller_path.
#
# ==== Returns
# * <tt>string</tt>
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 4f55537fe2..02a27110e4 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -328,7 +328,7 @@ module ActionDispatch
# +call+ or a string representing a controller's action.
#
# match 'path', :to => 'controller#action'
- # match 'path', :to => lambda { [200, {}, "Success!"] }
+ # match 'path', :to => lambda { |env| [200, {}, "Success!"] }
# match 'path', :to => RackApp
#
# [:on]