Skip to content

Commit

Permalink
Merge branch 'master' of github.com:lifo/docrails
Browse files Browse the repository at this point in the history
  • Loading branch information
tilsammans committed Aug 26, 2010
2 parents 80ae74d + 0631bf4 commit d3bc970
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion railties/guides/source/action_view_overview.textile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ A method for caching fragments of a view rather than an entire action or page. T


<ruby> <ruby>
<% cache do %> <% cache do %>
<%= render :partial => "shared/footer" %> <%= render "shared/footer" %>
<% end %> <% end %>
</ruby> </ruby>


Expand Down
12 changes: 4 additions & 8 deletions railties/guides/source/getting_started.textile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1056,8 +1056,7 @@ Then in the +app/views/posts/show.html.erb+ you can change it to look like the f
</p> </p>


<h2>Comments</h2> <h2>Comments</h2>
<%= render :partial => "comments/comment", <%= render @post.comments %>
:collection => @post.comments %>


<h2>Add a comment:</h2> <h2>Add a comment:</h2>
<%= form_for([@post, @post.comments.build]) do |f| %> <%= form_for([@post, @post.comments.build]) do |f| %>
Expand Down Expand Up @@ -1127,8 +1126,7 @@ Then you make the +app/views/posts/show.html.erb+ look like the following:
</p> </p>


<h2>Comments</h2> <h2>Comments</h2>
<%= render :partial => "comments/comment", <%= render @post.comments %>
:collection => @post.comments %>


<h2>Add a comment:</h2> <h2>Add a comment:</h2>
<%= render "comments/form" %> <%= render "comments/form" %>
Expand Down Expand Up @@ -1381,8 +1379,7 @@ Finally, we will edit the <tt>app/views/posts/show.html.erb</tt> template to sho
</p> </p>


<h2>Comments</h2> <h2>Comments</h2>
<%= render :partial => "comments/comment", <%= render @post.comments %>
:collection => @post.comments %>


<h2>Add a comment:</h2> <h2>Add a comment:</h2>
<%= render "comments/form" %> <%= render "comments/form" %>
Expand Down Expand Up @@ -1436,8 +1433,7 @@ Now you can edit the view in <tt>app/views/posts/show.html.erb</tt> to look like
</p> </p>


<h2>Comments</h2> <h2>Comments</h2>
<%= render :partial => "comments/comment", <%= render @post.comments %>
:collection => @post.comments %>


<h2>Add a comment:</h2> <h2>Add a comment:</h2>
<%= render "comments/form" %> <%= render "comments/form" %>
Expand Down
2 changes: 1 addition & 1 deletion railties/guides/source/performance_testing.textile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ And in "views":http://api.rubyonrails.org/classes/ActionController/Benchmarking/


<erb> <erb>
<% benchmark("Showing projects partial") do %> <% benchmark("Showing projects partial") do %>
<%= render :partial => @projects %> <%= render @projects %>
<% end %> <% end %>
</erb> </erb>


Expand Down

0 comments on commit d3bc970

Please sign in to comment.