aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/action_mailer_basics.textile
diff options
context:
space:
mode:
authorDan Pickett <dpickett@enlightsolutions.com>2011-04-29 19:18:10 -0400
committerDan Pickett <dpickett@enlightsolutions.com>2011-04-29 19:18:10 -0400
commit1efaed5af13f876833b3acd614e8d0116812f308 (patch)
tree8b2dd01afee8b4bdcf976d6a082d9fb89b32d43e /railties/guides/source/action_mailer_basics.textile
parent85c8d73642f03410b86ee842edcfe0eba1d4252c (diff)
parent010dbf7a2fd30f8dabebb3f04fed22c661d6bf80 (diff)
downloadrails-1efaed5af13f876833b3acd614e8d0116812f308.tar.gz
rails-1efaed5af13f876833b3acd614e8d0116812f308.tar.bz2
rails-1efaed5af13f876833b3acd614e8d0116812f308.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/guides/source/action_mailer_basics.textile')
-rw-r--r--railties/guides/source/action_mailer_basics.textile6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
index 56da360972..a6ff8f877d 100644
--- a/railties/guides/source/action_mailer_basics.textile
+++ b/railties/guides/source/action_mailer_basics.textile
@@ -120,7 +120,7 @@ Now that we have a user model to play with, we will just edit the +app/controlle
<ruby>
class UsersController < ApplicationController
# POST /users
- # POST /users.xml
+ # POST /users.json
def create
@user = User.new(params[:user])
@@ -130,10 +130,10 @@ class UsersController < ApplicationController
UserMailer.welcome_email(@user).deliver
format.html { redirect_to(@user, :notice => 'User was successfully created.') }
- format.xml { render :xml => @user, :status => :created, :location => @user }
+ format.json { render :json => @user, :status => :created, :location => @user }
else
format.html { render :action => "new" }
- format.xml { render :xml => @user.errors, :status => :unprocessable_entity }
+ format.json { render :json => @user.errors, :status => :unprocessable_entity }
end
end
end