aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base.rb
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2010-12-25 01:31:00 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2010-12-25 01:31:00 +0530
commitc6adc64e00fd6ee1065f34206629a00d95cd3cb3 (patch)
treea47b3e0a2dd2779907e36b9cd9b5eb5b2d409641 /actionpack/lib/action_controller/base.rb
parent5cefa00d91726a829d753e88b9e8b1bb27f0f728 (diff)
parent4e50c6c08aa420456f0e456444a0cb4a277de7a7 (diff)
downloadrails-c6adc64e00fd6ee1065f34206629a00d95cd3cb3.tar.gz
rails-c6adc64e00fd6ee1065f34206629a00d95cd3cb3.tar.bz2
rails-c6adc64e00fd6ee1065f34206629a00d95cd3cb3.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-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 48308cbb60..81c0698fb8 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -24,7 +24,7 @@ module ActionController
#
# Actions, by default, render a template in the <tt>app/views</tt> directory corresponding to the name of the controller and action
# after executing code in the action. For example, the +index+ action of the PostsController would render the
- # template <tt>app/views/posts/index.erb</tt> by default after populating the <tt>@posts</tt> instance variable.
+ # template <tt>app/views/posts/index.html.erb</tt> by default after populating the <tt>@posts</tt> instance variable.
#
# Unlike index, the create action will not render a template. After performing its main purpose (creating a
# new post), it initiates a redirect instead. This redirect works by returning an external