diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-30 22:53:52 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-30 22:53:52 +0530 |
| commit | ec74763c393c6a5f54eb64f0313610aead7f815a (patch) | |
| tree | 39e3712c4cfc589083ed5072b6b8373361334441 /actionpack/lib/action_view | |
| parent | 0406a13fac7f809cb511e45583259e66d8739b4f (diff) | |
| parent | 032f502f1221129d8446d3e25cd8956469b43456 (diff) | |
| download | rails-ec74763c393c6a5f54eb64f0313610aead7f815a.tar.gz rails-ec74763c393c6a5f54eb64f0313610aead7f815a.tar.bz2 rails-ec74763c393c6a5f54eb64f0313610aead7f815a.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/renderer/template_renderer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb index ae923de24e..82892593f8 100644 --- a/actionpack/lib/action_view/renderer/template_renderer.rb +++ b/actionpack/lib/action_view/renderer/template_renderer.rb @@ -35,7 +35,7 @@ module ActionView end end - # Renders the given template. An string representing the layout can be + # Renders the given template. A string representing the layout can be # supplied as well. def render_template(template, layout_name = nil, locals = {}) #:nodoc: view, locals = @view, locals || {} |