diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-24 17:15:10 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-24 17:15:10 +0530 |
| commit | 014498e1d74decd57d44d45c187fa4f4b968b811 (patch) | |
| tree | 948610d910d28fc976cdffffd533879a16b01557 /actionpack/lib | |
| parent | 780ab582091cf06ded9540a5d4fef23086e9bac3 (diff) | |
| parent | 2fab826db055f7b59bb83b834d730d69c8c7b25e (diff) | |
| download | rails-014498e1d74decd57d44d45c187fa4f4b968b811.tar.gz rails-014498e1d74decd57d44d45c187fa4f4b968b811.tar.bz2 rails-014498e1d74decd57d44d45c187fa4f4b968b811.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
guides/source/ruby_on_rails_guides_guidelines.textile
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/renderer/partial_renderer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb index 245a19deec..232667ec01 100644 --- a/actionpack/lib/action_view/renderer/partial_renderer.rb +++ b/actionpack/lib/action_view/renderer/partial_renderer.rb @@ -32,7 +32,7 @@ module ActionView # # <%= render :partial => "account", :object => @buyer %> # - # would provide the +@buyer+ object to the partial, available under the local variable +account+ and is + # would provide the <tt>@buyer</tt> object to the partial, available under the local variable +account+ and is # equivalent to: # # <%= render :partial => "account", :locals => { :account => @buyer } %> |