aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/layouts_and_rendering.md
diff options
context:
space:
mode:
authorHenrik N <henrik@nyh.se>2012-10-25 13:45:32 +0200
committerHenrik N <henrik@nyh.se>2012-10-25 13:46:11 +0200
commitcc5dfccddab6b08b924799cca8be8edd17d479af (patch)
tree4683b37b39d5ba83511dd32fd383cd3ad2e0886e /guides/source/layouts_and_rendering.md
parent4fee5dfed2200b3f5b2b90b14f9e0c0a7e925b35 (diff)
downloadrails-cc5dfccddab6b08b924799cca8be8edd17d479af.tar.gz
rails-cc5dfccddab6b08b924799cca8be8edd17d479af.tar.bz2
rails-cc5dfccddab6b08b924799cca8be8edd17d479af.zip
AJAX -> Ajax in layouts_and_rendering guide.
Fixed in the JS guide in 8c38172ba59e16d8e523ac4f1c5ae29b6851d3ee
Diffstat (limited to 'guides/source/layouts_and_rendering.md')
-rw-r--r--guides/source/layouts_and_rendering.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/guides/source/layouts_and_rendering.md b/guides/source/layouts_and_rendering.md
index 8277859232..5f4f7e8511 100644
--- a/guides/source/layouts_and_rendering.md
+++ b/guides/source/layouts_and_rendering.md
@@ -124,7 +124,7 @@ Cache-Control: no-cache
$
```
-We see there is an empty response (no data after the `Cache-Control` line), but the request was successful because Rails has set the response to 200 OK. You can set the `:status` option on render to change this response. Rendering nothing can be useful for AJAX requests where all you want to send back to the browser is an acknowledgment that the request was completed.
+We see there is an empty response (no data after the `Cache-Control` line), but the request was successful because Rails has set the response to 200 OK. You can set the `:status` option on render to change this response. Rendering nothing can be useful for Ajax requests where all you want to send back to the browser is an acknowledgment that the request was completed.
TIP: You should probably be using the `head` method, discussed later in this guide, instead of `render :nothing`. This provides additional flexibility and makes it explicit that you're only generating HTTP headers.
@@ -259,13 +259,13 @@ You can send plain text - with no markup at all - back to the browser by using t
render :text => "OK"
```
-TIP: Rendering pure text is most useful when you're responding to AJAX or web service requests that are expecting something other than proper HTML.
+TIP: Rendering pure text is most useful when you're responding to Ajax or web service requests that are expecting something other than proper HTML.
NOTE: By default, if you use the `:text` option, the text is rendered without using the current layout. If you want Rails to put the text into the current layout, you need to add the `:layout => true` option.
#### Rendering JSON
-JSON is a JavaScript data format used by many AJAX libraries. Rails has built-in support for converting objects to JSON and rendering that JSON back to the browser:
+JSON is a JavaScript data format used by many Ajax libraries. Rails has built-in support for converting objects to JSON and rendering that JSON back to the browser:
```ruby
render :json => @product