aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2016-11-13 14:09:52 +0000
committerGitHub <noreply@github.com>2016-11-13 14:09:52 +0000
commitdf63abe6d31cdbe426ff6dda9bdd878acc602728 (patch)
treee9b1522cdee6f53699160689ec041aee35be027b /actionview
parent0ef5b6c1630847c56a7a7ffe96045b72b23cd376 (diff)
parent7e7d6ccf344d3cb42b836e22e1381269f55b67d2 (diff)
downloadrails-df63abe6d31cdbe426ff6dda9bdd878acc602728.tar.gz
rails-df63abe6d31cdbe426ff6dda9bdd878acc602728.tar.bz2
rails-df63abe6d31cdbe426ff6dda9bdd878acc602728.zip
Merge pull request #27024 from vipulnsward/changelog-edits
Changelog edits
Diffstat (limited to 'actionview')
-rw-r--r--actionview/CHANGELOG.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 67bd9b5c8f..6e6ce64e72 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -2,12 +2,12 @@
*Rafael Mendonça França*
-* Render now accepts any keys for locals, including reserved words
+* Render now accepts any keys for locals, including reserved keywords.
Only locals with valid variable names get set directly. Others
- will still be available in local_assigns.
+ will still be available in `local_assigns`.
- Example of render with reserved words:
+ Example of render with reserved keywords:
```erb
<%= render "example", class: "text-center", message: "Hello world!" %>