diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-09-28 23:17:07 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-09-28 23:17:07 +0530 |
| commit | 955a72c692a4298d238cc2e6353b9874099203f1 (patch) | |
| tree | 2a05fecd15526cd0013c22e45825be1aca4844d9 /actionpack/lib/action_view | |
| parent | 77fbe1c0199567486c422fdf5cce49f2c11fc953 (diff) | |
| parent | cf3e760b87c49470c9a26ab3e2da67602474be1f (diff) | |
| download | rails-955a72c692a4298d238cc2e6353b9874099203f1.tar.gz rails-955a72c692a4298d238cc2e6353b9874099203f1.tar.bz2 rails-955a72c692a4298d238cc2e6353b9874099203f1.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionpack/lib/action_view/helpers/asset_tag_helper.rb
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 27ba57ff58..5b5fc84e90 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -369,9 +369,9 @@ module ActionView # <tt>:size</tt> will be ignored if the value is not in the correct format. # # image_tag("icon") - # # => <img src="/assets/icon" alt="Icon" /> + # # => <img alt="Icon" src="/assets/icon" /> # image_tag("icon.png") - # # => <img src="/assets/icon.png" alt="Icon" /> + # # => <img alt="Icon" src="/assets/icon.png" /> # image_tag("icon.png", :size => "16x10", :alt => "Edit Entry") # # => <img src="/assets/icon.png" width="16" height="10" alt="Edit Entry" /> # image_tag("/icons/icon.gif", :size => "16") |