From 6e782f8944122e99091b38b07dcc777f02b1836c Mon Sep 17 00:00:00 2001
From: Alan Zeino <alan.zeino@gmail.com>
Date: Mon, 12 Sep 2011 11:12:09 +1000
Subject: Slight change to reflect current 'destroy' code generated by scaffold
 in 3.1 release.

---
 railties/guides/source/getting_started.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 1587b20c18..219fa5afde 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -1083,8 +1083,8 @@ def destroy
   @post.destroy
 
   respond_to do |format|
-    format.html  { redirect_to(posts_url) }
-    format.json  { render :json => {}, :status => :ok }
+    format.html { redirect_to posts_url }
+    format.json { head :ok }
   end
 end
 </ruby>
-- 
cgit v1.2.3


From 70198fdb3614ef0299e848440df62d18b46a7f77 Mon Sep 17 00:00:00 2001
From: dharmatech <wayo.cavazos@gmail.com>
Date: Mon, 12 Sep 2011 12:05:15 -0500
Subject: getting_started.textile: Fix typos in section "Rendering a Partial
 Form"

---
 railties/guides/source/getting_started.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 1587b20c18..ae9a689678 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -1453,7 +1453,7 @@ comment to a local variable named the same as the partial, in this case
 
 h4. Rendering a Partial Form
 
-Lets also move that new comment section out to it's own partial, again, you
+Let's also move that new comment section out to its own partial. Again, you
 create a file +app/views/comments/_form.html.erb+ and in it you put:
 
 <erb>
-- 
cgit v1.2.3


From 7d235b972b29659d94e2b290be6e0ad3bc6a2668 Mon Sep 17 00:00:00 2001
From: dharmatech <wayo.cavazos@gmail.com>
Date: Mon, 12 Sep 2011 15:55:01 -0500
Subject: getting_started.textile: Fix typo and split up a sentence in section
 "Building a Multi-Model Form"

---
 railties/guides/source/getting_started.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/guides/source/getting_started.textile')

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 37aabcda83..b8dd4be73b 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -1719,8 +1719,8 @@ This example shows another option of the render helper, being able to pass in
 local variables, in this case, we want the local variable +form+ in the partial
 to refer to the +post_form+ object.
 
-We also add a <tt>@post.tags.build</tt> at the top of this form, this is to make
-sure there is a new tag ready to have it's name filled in by the user. If you do
+We also add a <tt>@post.tags.build</tt> at the top of this form. This is to make
+sure there is a new tag ready to have its name filled in by the user. If you do
 not build the new tag, then the form will not appear as there is no new Tag
 object ready to create.
 
-- 
cgit v1.2.3

