diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-11 07:10:32 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-11 07:10:32 +0000 |
| commit | fede0f573ebe64135c60d1ca2ef0c6e98819ba9e (patch) | |
| tree | 2fbed88d091153a69e1c529c1e07db64b9092181 /actionpack/lib/action_controller | |
| parent | 216b0e0fbab310d374d2a43fe774839ac8ce6cdb (diff) | |
| download | rails-fede0f573ebe64135c60d1ca2ef0c6e98819ba9e.tar.gz rails-fede0f573ebe64135c60d1ca2ef0c6e98819ba9e.tar.bz2 rails-fede0f573ebe64135c60d1ca2ef0c6e98819ba9e.zip | |
Fixed documentation for :action/:template confusion #1643
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1813 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 873684cfaa..44341f1bfb 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -463,9 +463,6 @@ module ActionController #:nodoc: # # Renders the template for the action "goal" within the current controller # render :action => "goal" # - # # Renders the template for the action "explosion" from the ErrorsController - # render :action => "errors/explosion", :status => 500 - # # # Renders the template for the action "short_goal" within the current controller, # # but without the current active layout # render :action => "short_goal", :layout => false @@ -508,14 +505,17 @@ module ActionController #:nodoc: # # === Rendering a file # - # File rendering works just like action rendering except that it takes a complete path to the template intended - # for rendering and that the current layout is not applied automatically. + # File rendering works just like action rendering except that it takes a path relative to the template root or an absolute + # path if use_full_path is passed as true. The current layout is not applied automatically. + # + # # Renders the template located in [TEMPLATE_ROOT]/weblog/show.r(html|xml) (in Rails, app/views/weblog/show.rhtml) + # render :file => "weblog/show" # # # Renders the template located in /path/to/some/template.r(html|xml) - # render :file => "/path/to/some/template" + # render :file => "/path/to/some/template", :use_full_path => false # # # Renders the same template within the current layout, but with a 404 status code - # render :file => "/path/to/some/template", :layout => true, :status => 404 + # render :file => "/path/to/some/template", :use_full_path => false, :layout => true, :status => 404 # # _Deprecation_ _notice_: This used to have the signature <tt>render_file(path, status = 200)</tt> # |