aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-12-06 23:10:58 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-12-06 23:10:58 +0000
commit189ecafa5395f899c2f0593039cf978d637e31b3 (patch)
tree3d20bff68c25dbebea66bee6074c83f913b9d5ae /actionpack/CHANGELOG
parent91d99e2f5312688d99583a2ed5a08e17022a4218 (diff)
downloadrails-189ecafa5395f899c2f0593039cf978d637e31b3.tar.gz
rails-189ecafa5395f899c2f0593039cf978d637e31b3.tar.bz2
rails-189ecafa5395f899c2f0593039cf978d637e31b3.zip
Update changelog to reflect application/json content type.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5696 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r--actionpack/CHANGELOG2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 52253a8777..55d32d7592 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,7 +1,7 @@
*SVN*
* respond_to recognizes JSON. render :json => @person.to_json automatically sets the content type and takes a :callback option to specify a client-side function to call using the rendered JSON as an argument. #4185 [Scott Raymond, eventualbuddha]
- # text/x-json response with body 'Element.show({:name: "David"})'
+ # application/json response with body 'Element.show({:name: "David"})'
respond_to do |format|
format.json { render :json => { :name => "David" }.to_json, :callback => 'Element.show' }
end