diff options
| author | José Valim <jose.valim@gmail.com> | 2009-08-07 16:10:17 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-08-07 16:10:17 +0200 |
| commit | dac8927b0576bff89ba3a4fcbf502dffc9b39e89 (patch) | |
| tree | 58c25132a52ef5cc56f406f8e2df416c5f2776a6 /actionpack/lib/action_view/context.rb | |
| parent | 072c87b532a0bfb334787928248863a2561dc849 (diff) | |
| parent | 606e950ccbd02a10f724c73543575a2a4e1ed8cb (diff) | |
| download | rails-dac8927b0576bff89ba3a4fcbf502dffc9b39e89.tar.gz rails-dac8927b0576bff89ba3a4fcbf502dffc9b39e89.tar.bz2 rails-dac8927b0576bff89ba3a4fcbf502dffc9b39e89.zip | |
Merge branch 'master' of git://github.com/rails/rails into old
Diffstat (limited to 'actionpack/lib/action_view/context.rb')
| -rw-r--r-- | actionpack/lib/action_view/context.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/context.rb b/actionpack/lib/action_view/context.rb index f212fe25eb..df078a7151 100644 --- a/actionpack/lib/action_view/context.rb +++ b/actionpack/lib/action_view/context.rb @@ -12,11 +12,11 @@ module ActionView # # Context.for_controller[controller] Create a new ActionView instance for a # controller - # Context#_render_partial_from_controller[options] + # Context#render_partial[options] # - responsible for setting options[:_template] # - Returns String with the rendered partial # options<Hash>:: see _render_partial in ActionView::Base - # Context#_render_template_from_controller[template, layout, options, partial] + # Context#render_template[template, layout, options, partial] # - Returns String with the rendered template # template<ActionView::Template>:: The template to render # layout<ActionView::Template>:: The layout to render around the template |