aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoost Baaij <joost@spacebabies.nl>2010-08-26 21:33:35 +0200
committerJoost Baaij <joost@spacebabies.nl>2010-08-26 21:33:35 +0200
commitd3bc97050a056de937ae514c39d43a50af45594d (patch)
treeaec33b96cf38c29d88f6a6ba848b22b8007783eb
parent80ae74dea7c4f91ec47935409f666ae8a9c094a8 (diff)
parent0631bf4baf463a0e8ca74c56a21ed0b320d254d0 (diff)
downloadrails-d3bc97050a056de937ae514c39d43a50af45594d.tar.gz
rails-d3bc97050a056de937ae514c39d43a50af45594d.tar.bz2
rails-d3bc97050a056de937ae514c39d43a50af45594d.zip
Merge branch 'master' of github.com:lifo/docrails
-rw-r--r--railties/guides/source/action_view_overview.textile2
-rw-r--r--railties/guides/source/getting_started.textile12
-rw-r--r--railties/guides/source/performance_testing.textile2
3 files changed, 6 insertions, 10 deletions
diff --git a/railties/guides/source/action_view_overview.textile b/railties/guides/source/action_view_overview.textile
index e242cdaf73..459d70f111 100644
--- a/railties/guides/source/action_view_overview.textile
+++ b/railties/guides/source/action_view_overview.textile
@@ -428,7 +428,7 @@ A method for caching fragments of a view rather than an entire action or page. T
<ruby>
<% cache do %>
- <%= render :partial => "shared/footer" %>
+ <%= render "shared/footer" %>
<% end %>
</ruby>
diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index dc60377e34..48393d2156 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -1056,8 +1056,7 @@ Then in the +app/views/posts/show.html.erb+ you can change it to look like the f
</p>
<h2>Comments</h2>
-<%= render :partial => "comments/comment",
- :collection => @post.comments %>
+<%= render @post.comments %>
<h2>Add a comment:</h2>
<%= form_for([@post, @post.comments.build]) do |f| %>
@@ -1127,8 +1126,7 @@ Then you make the +app/views/posts/show.html.erb+ look like the following:
</p>
<h2>Comments</h2>
-<%= render :partial => "comments/comment",
- :collection => @post.comments %>
+<%= render @post.comments %>
<h2>Add a comment:</h2>
<%= render "comments/form" %>
@@ -1381,8 +1379,7 @@ Finally, we will edit the <tt>app/views/posts/show.html.erb</tt> template to sho
</p>
<h2>Comments</h2>
-<%= render :partial => "comments/comment",
- :collection => @post.comments %>
+<%= render @post.comments %>
<h2>Add a comment:</h2>
<%= render "comments/form" %>
@@ -1436,8 +1433,7 @@ Now you can edit the view in <tt>app/views/posts/show.html.erb</tt> to look like
</p>
<h2>Comments</h2>
-<%= render :partial => "comments/comment",
- :collection => @post.comments %>
+<%= render @post.comments %>
<h2>Add a comment:</h2>
<%= render "comments/form" %>
diff --git a/railties/guides/source/performance_testing.textile b/railties/guides/source/performance_testing.textile
index 65f8d07e7a..7b21485ea0 100644
--- a/railties/guides/source/performance_testing.textile
+++ b/railties/guides/source/performance_testing.textile
@@ -469,7 +469,7 @@ And in "views":http://api.rubyonrails.org/classes/ActionController/Benchmarking/
<erb>
<% benchmark("Showing projects partial") do %>
- <%= render :partial => @projects %>
+ <%= render @projects %>
<% end %>
</erb>