diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2015-06-21 18:37:55 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2015-06-21 18:37:55 +0000 |
| commit | f6797a7683e5367046217fa85900f0288a504f84 (patch) | |
| tree | f39abeafe541fe324a4264fefdd6b0fae7f9b976 /guides | |
| parent | 29959eb59da3cedee71d29fe84e82cfa71ad4cf3 (diff) | |
| parent | 29a64f2384f53760e9133d11a0c60e0d32ed9187 (diff) | |
| download | rails-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')
| -rw-r--r-- | guides/source/action_view_overview.md | 4 | ||||
| -rw-r--r-- | guides/source/rails_on_rack.md | 2 |
2 files changed, 2 insertions, 4 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) diff --git a/guides/source/rails_on_rack.md b/guides/source/rails_on_rack.md index 117017af90..99ab47d1db 100644 --- a/guides/source/rails_on_rack.md +++ b/guides/source/rails_on_rack.md @@ -327,8 +327,6 @@ Resources * [Official Rack Website](http://rack.github.io) * [Introducing Rack](http://chneukirchen.org/blog/archive/2007/02/introducing-rack.html) -* [Ruby on Rack #1 - Hello Rack!](http://m.onkey.org/ruby-on-rack-1-hello-rack) -* [Ruby on Rack #2 - The Builder](http://m.onkey.org/ruby-on-rack-2-the-builder) ### Understanding Middlewares |