aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorप्रथमेश Sonpatki <csonpatki@gmail.com>2016-01-19 16:02:10 +0530
committerप्रथमेश Sonpatki <csonpatki@gmail.com>2016-01-19 16:02:10 +0530
commit1599868610c43afc2836dc1b2c8dd3a8e45eddcf (patch)
tree8d3b15a68a3ea7ab4b2510d694873a4dce610208
parenta48f893cbad096f7a4df1323a90d2f052ee2d2e0 (diff)
parent0764e678635168588a8ccb838c61011e906f4a4e (diff)
downloadrails-1599868610c43afc2836dc1b2c8dd3a8e45eddcf.tar.gz
rails-1599868610c43afc2836dc1b2c8dd3a8e45eddcf.tar.bz2
rails-1599868610c43afc2836dc1b2c8dd3a8e45eddcf.zip
Merge pull request #23116 from vipulnsward/22648-html-safe-text
Make text about render :html option clearer to state, text will get e…
-rw-r--r--guides/source/layouts_and_rendering.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/layouts_and_rendering.md b/guides/source/layouts_and_rendering.md
index 9b7f916b9e..d55e1007ee 100644
--- a/guides/source/layouts_and_rendering.md
+++ b/guides/source/layouts_and_rendering.md
@@ -238,7 +238,7 @@ TIP: This is useful when you're rendering a small snippet of HTML code.
However, you might want to consider moving it to a template file if the markup
is complex.
-NOTE: This option will escape HTML entities if the string is not HTML safe.
+NOTE: When using `html:` option, HTML entities will be escaped if the string is not marked as HTML safe by using `html_safe` method.
#### Rendering JSON