diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-12-29 23:46:03 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-12-29 23:46:03 +0100 |
| commit | 69765aad8bcc853e7ab6b0e79f4edece2cdd7fe2 (patch) | |
| tree | cbff92b476133e56dfdc4cfbdf2f5ecb6cfca2c3 /actionpack/lib/action_controller/base.rb | |
| parent | 0ac66caac5581c4793d120c8ad4a2cf4137f6ce2 (diff) | |
| parent | 6f58b9ad5331d3619fc68a4706d5f85a95510a63 (diff) | |
| download | rails-69765aad8bcc853e7ab6b0e79f4edece2cdd7fe2.tar.gz rails-69765aad8bcc853e7ab6b0e79f4edece2cdd7fe2.tar.bz2 rails-69765aad8bcc853e7ab6b0e79f4edece2cdd7fe2.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 2 |
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 |