aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/layouts_and_rendering.md
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2015-03-05 14:17:01 +0100
committerRobin Dupret <robin.dupret@gmail.com>2015-03-05 14:18:09 +0100
commitd969405acd98a6e6b39391e45fc3803fd3f26d32 (patch)
tree48da629602a9797863a2afaceaba731ae069f643 /guides/source/layouts_and_rendering.md
parent95cfeb968d189d5cd7f8ebcf53edfa3e2cd5f335 (diff)
downloadrails-d969405acd98a6e6b39391e45fc3803fd3f26d32.tar.gz
rails-d969405acd98a6e6b39391e45fc3803fd3f26d32.tar.bz2
rails-d969405acd98a6e6b39391e45fc3803fd3f26d32.zip
Some documentation edits [ci skip]
* Fix a few typos * Wrap some lines around 80 chars * Rephrase some statements
Diffstat (limited to 'guides/source/layouts_and_rendering.md')
-rw-r--r--guides/source/layouts_and_rendering.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/guides/source/layouts_and_rendering.md b/guides/source/layouts_and_rendering.md
index 54db23bb32..c57fa358d6 100644
--- a/guides/source/layouts_and_rendering.md
+++ b/guides/source/layouts_and_rendering.md
@@ -428,12 +428,13 @@ Rails understands both numeric status codes and the corresponding symbols shown
| | 510 | :not_extended |
| | 511 | :network_authentication_required |
-NOTE: If you try to render content along with a non-content status code
+NOTE: If you try to render content along with a non-content status code
(100-199, 204, 205 or 304), it will be dropped from the response.
##### The `:formats` Option
-Rails uses the format specified in request (or `:html` by default). You can change this adding the `:formats` option with a symbol or an array:
+Rails uses the format specified in the request (or `:html` by default). You can
+change this passing the `:formats` option with a symbol or an array:
```ruby
render formats: :xml