diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-11-03 01:56:16 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-11-03 01:56:16 +0530 |
| commit | 3b0bb08699ce409b8213c82956dc34086dcbc8b9 (patch) | |
| tree | 34398e3421fcfd86aab2b5fc757175dd2ce7664d /actionpack/lib/action_view/helpers/rendering_helper.rb | |
| parent | 974467d70d337d4c60414c792e275d367143217b (diff) | |
| parent | ee917493e451e552fef18367f8bcba2f36080685 (diff) | |
| download | rails-3b0bb08699ce409b8213c82956dc34086dcbc8b9.tar.gz rails-3b0bb08699ce409b8213c82956dc34086dcbc8b9.tar.bz2 rails-3b0bb08699ce409b8213c82956dc34086dcbc8b9.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionpack/lib/action_controller/metal/mime_responds.rb
activerecord/lib/active_record/attribute_methods.rb
guides/source/working_with_javascript_in_rails.md
Diffstat (limited to 'actionpack/lib/action_view/helpers/rendering_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/rendering_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/rendering_helper.rb b/actionpack/lib/action_view/helpers/rendering_helper.rb index 626e1a1ab7..458086de96 100644 --- a/actionpack/lib/action_view/helpers/rendering_helper.rb +++ b/actionpack/lib/action_view/helpers/rendering_helper.rb @@ -39,7 +39,7 @@ module ActionView # The user can override this default by passing a block to the layout: # # # The template - # <%= render :layout => "my_layout" do %> + # <%= render layout: "my_layout" do %> # Content # <% end %> # @@ -59,7 +59,7 @@ module ActionView # Finally, the block can take block arguments, which can be passed in by +yield+: # # # The template - # <%= render :layout => "my_layout" do |customer| %> + # <%= render layout: "my_layout" do |customer| %> # Hello <%= customer.name %> # <% end %> # |