3 files changed, 6 insertions, 5 deletions
diff --git a/railties/guides/code/getting_started/app/controllers/posts_controller.rb b/railties/guides/code/getting_started/app/controllers/posts_controller.rb
index 7e903c984c..1581d4eb16 100644
--- a/railties/guides/code/getting_started/app/controllers/posts_controller.rb
+++ b/railties/guides/code/getting_started/app/controllers/posts_controller.rb
@@ -62,7 +62,7 @@ class PostsController < ApplicationController
     respond_to do |format|
       if @post.update_attributes(params[:post])
         format.html { redirect_to @post, notice: 'Post was successfully updated.' }
-        format.json { head :ok }
+        format.json { head :no_content }
       else
         format.html { render action: "edit" }
         format.json { render json: @post.errors, status: :unprocessable_entity }
@@ -78,7 +78,7 @@ class PostsController < ApplicationController
 
     respond_to do |format|
       format.html { redirect_to posts_url }
-      format.json { head :ok }
+      format.json { head :no_content }
     end
   end
 end
diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb
index 4682ead66e..6f6d3bda80 100644
--- a/railties/guides/rails_guides/generator.rb
+++ b/railties/guides/rails_guides/generator.rb
@@ -137,7 +137,8 @@ module RailsGuides
 
         if guide =~ /\.html\.erb$/
           # Generate the special pages like the home.
-          result = view.render(:layout => 'layout', :file => guide)
+          # Passing a template handler in the template name is deprecated. So pass the file name without the extension.
+          result = view.render(:layout => 'layout', :file => $`)
         else
           body = File.read(File.join(source_dir, guide))
           body = set_header_section(body, view)
diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 5f370615ca..8a0a70efad 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -1071,7 +1071,7 @@ def update
     if @post.update_attributes(params[:post])
       format.html  { redirect_to(@post,
                     :notice => 'Post was successfully updated.') }
-      format.json  { render :json => {}, :status => :ok }
+      format.json  { head :no_content }
     else
       format.html  { render :action => "edit" }
       format.json  { render :json => @post.errors,
@@ -1100,7 +1100,7 @@ def destroy
 
   respond_to do |format|
     format.html { redirect_to posts_url }
-    format.json { head :ok }
+    format.json { head :no_content }
   end
 end
 </ruby>