aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/action_view_overview.md
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2015-06-21 18:37:55 +0000
committerVijay Dev <vijaydev.cse@gmail.com>2015-06-21 18:37:55 +0000
commitf6797a7683e5367046217fa85900f0288a504f84 (patch)
treef39abeafe541fe324a4264fefdd6b0fae7f9b976 /guides/source/action_view_overview.md
parent29959eb59da3cedee71d29fe84e82cfa71ad4cf3 (diff)
parent29a64f2384f53760e9133d11a0c60e0d32ed9187 (diff)
downloadrails-f6797a7683e5367046217fa85900f0288a504f84.tar.gz
rails-f6797a7683e5367046217fa85900f0288a504f84.tar.bz2
rails-f6797a7683e5367046217fa85900f0288a504f84.zip
Merge branch 'master' of github.com:rails/docrails
Conflicts: guides/source/configuring.md
Diffstat (limited to 'guides/source/action_view_overview.md')
-rw-r--r--guides/source/action_view_overview.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/action_view_overview.md b/guides/source/action_view_overview.md
index 09fac41491..3c1c3c7873 100644
--- a/guides/source/action_view_overview.md
+++ b/guides/source/action_view_overview.md
@@ -725,7 +725,7 @@ Returns a select tag with options for each of the seconds 0 through 59 with the
```ruby
# Generates a select field for seconds that defaults to the seconds for the time provided
-select_second(Time.now + 16.minutes)
+select_second(Time.now + 16.seconds)
```
#### select_time
@@ -1429,7 +1429,7 @@ This sanitize helper will HTML encode all tags and strip all attributes that are
sanitize @article.body
```
-If either the `:attributes` or `:tags` options are passed, only the mentioned tags and attributes are allowed and nothing else.
+If either the `:attributes` or `:tags` options are passed, only the mentioned attributes and tags are allowed and nothing else.
```ruby
sanitize @article.body, tags: %w(table tr td), attributes: %w(id class style)