aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2015-08-13 11:50:41 +0200
committerRobin Dupret <robin.dupret@gmail.com>2015-08-13 11:50:41 +0200
commit812375b2ccfbe5190acd06e9117467a886f91ce6 (patch)
treefcd960f2a701ba6c268c8b90a6c346f880391b61
parent68e3279163d06e6b04e043f91c9470e9259bbbe0 (diff)
parent03615fc283f65cbfcc8aec62371bed4b48523fde (diff)
downloadrails-812375b2ccfbe5190acd06e9117467a886f91ce6.tar.gz
rails-812375b2ccfbe5190acd06e9117467a886f91ce6.tar.bz2
rails-812375b2ccfbe5190acd06e9117467a886f91ce6.zip
Merge pull request #21221 from alietz/doc-asset-pipeline-clarification
[ci skip] Clarified asset pipeline guide
-rw-r--r--guides/source/asset_pipeline.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index fc7dd3a6c6..7b8d2d3aef 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -403,13 +403,13 @@ When using the asset pipeline, paths to assets must be re-written and
underscored in Ruby) for the following asset classes: image, font, video, audio,
JavaScript and stylesheet.
-* `url(/assets/rails.png)` becomes `image-url("rails.png")`
-* `"/assets/rails.png"` becomes `image-path("rails.png")` .
+* `image-url("rails.png")` returns `url(/assets/rails.png)`
+* `image-path("rails.png")` returns `"/assets/rails.png"`
The more generic form can also be used:
-* `url(/assets/rails.png)` becomes `asset-url("rails.png")`
-* `"/assets/rails.png"` becomes `asset-path("rails.png")`
+* `asset-url("rails.png")` returns `url(/assets/rails.png)`
+* `asset-path("rails.png")` returns `"/assets/rails.png"`
#### JavaScript/CoffeeScript and ERB