diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-03-30 15:46:14 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-03-30 15:46:14 +0530 |
| commit | 6d8c070821bc846eb263b8c045ae652ebd751569 (patch) | |
| tree | 414dcf7d7a9a5885235b0426e545bd21b994091d /guides/source/action_view_overview.md | |
| parent | 022ed6c763d91e1bb032150fc7ec5991141f8119 (diff) | |
| parent | 6bd1bbe7cf87ae2b4764e0ed0d5b583bd026af8a (diff) | |
| download | rails-6d8c070821bc846eb263b8c045ae652ebd751569.tar.gz rails-6d8c070821bc846eb263b8c045ae652ebd751569.tar.bz2 rails-6d8c070821bc846eb263b8c045ae652ebd751569.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
activerecord/test/cases/adapter_test.rb
guides/source/testing.md
[ci skip]
Diffstat (limited to 'guides/source/action_view_overview.md')
| -rw-r--r-- | guides/source/action_view_overview.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/action_view_overview.md b/guides/source/action_view_overview.md index 4cdac43a7e..3b5963efc2 100644 --- a/guides/source/action_view_overview.md +++ b/guides/source/action_view_overview.md @@ -492,7 +492,7 @@ image_path("edit.png") # => /assets/edit-2d1a2db63fc738690021fedb5a65b68e.png #### image_url -Computes the url to an image asset in the `app/asset/images` directory. This will call `image_path` internally and merge with your current host or your asset host. +Computes the url to an image asset in the `app/assets/images` directory. This will call `image_path` internally and merge with your current host or your asset host. ```ruby image_url("edit.png") # => http://www.example.com/assets/edit.png |