aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJames Miller <bensie@gmail.com>2010-08-25 14:55:24 -0700
committerJames Miller <bensie@gmail.com>2010-08-25 14:55:24 -0700
commit7a6d8e4ad47d571541762a6c80cc3e1f6831bd40 (patch)
tree6433697508c646ab27dd16bf1c8518839f1533f9 /railties
parent26961bc836148b2f6148fe51c272425c2ab10abf (diff)
downloadrails-7a6d8e4ad47d571541762a6c80cc3e1f6831bd40.tar.gz
rails-7a6d8e4ad47d571541762a6c80cc3e1f6831bd40.tar.bz2
rails-7a6d8e4ad47d571541762a6c80cc3e1f6831bd40.zip
to_json => as_json
Diffstat (limited to 'railties')
-rw-r--r--railties/guides/source/action_view_overview.textile2
-rw-r--r--railties/guides/source/layouts_and_rendering.textile2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/action_view_overview.textile b/railties/guides/source/action_view_overview.textile
index e242cdaf73..cd3c0a1b7b 100644
--- a/railties/guides/source/action_view_overview.textile
+++ b/railties/guides/source/action_view_overview.textile
@@ -1380,7 +1380,7 @@ page.insert_html :bottom, 'my_list', '<li>Last item</li>'
h5. literal
-Returns an object whose to_json evaluates to the code provided. Use this to pass a literal JavaScript expression as an argument to another JavaScriptGenerator method.
+Returns an object whose as_json evaluates to the code provided. Use this to pass a literal JavaScript expression as an argument to another JavaScriptGenerator method.
h5. redirect_to
diff --git a/railties/guides/source/layouts_and_rendering.textile b/railties/guides/source/layouts_and_rendering.textile
index fe5b4c8773..1bef4d2145 100644
--- a/railties/guides/source/layouts_and_rendering.textile
+++ b/railties/guides/source/layouts_and_rendering.textile
@@ -285,7 +285,7 @@ JSON is a javascript data format used by many AJAX libraries. Rails has built-in
render :json => @product
</ruby>
-TIP: You don't need to call +to_json+ on the object that you want to render. If you use the +:json+ option, +render+ will automatically call +to_json+ for you.
+TIP: You don't need to call +as_json+ on the object that you want to render. If you use the +:json+ option, +render+ will automatically call +as_json+ for you.
h5. Rendering XML