aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-08-06 14:45:20 +0200
committerYves Senn <yves.senn@gmail.com>2015-08-06 14:45:20 +0200
commit3a4b4559ea7928772e60662036ae4dab88d187c7 (patch)
treeb2d86417abff6fae83ed38ca4a4c64e73254b15e /guides
parent6586fdaf28a92fec126043f93f1ffef1255149db (diff)
parent0b92d80cec7b6f2620217b8e68adb30a3d606b8c (diff)
downloadrails-3a4b4559ea7928772e60662036ae4dab88d187c7.tar.gz
rails-3a4b4559ea7928772e60662036ae4dab88d187c7.tar.bz2
rails-3a4b4559ea7928772e60662036ae4dab88d187c7.zip
Merge pull request #21143 from alietz/doc-correct-sass-instructions
Documentation: correct instructions for using Sass with the asset pipeline [ci skip]
Diffstat (limited to 'guides')
-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 4a610e8458..fc7dd3a6c6 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.
-* `image-url("rails.png")` becomes `url(/assets/rails.png)`
-* `image-path("rails.png")` becomes `"/assets/rails.png"`.
+* `url(/assets/rails.png)` becomes `image-url("rails.png")`
+* `"/assets/rails.png"` becomes `image-path("rails.png")` .
The more generic form can also be used:
-* `asset-url("rails.png")` becomes `url(/assets/rails.png)`
-* `asset-path("rails.png")` becomes `"/assets/rails.png"`
+* `url(/assets/rails.png)` becomes `asset-url("rails.png")`
+* `"/assets/rails.png"` becomes `asset-path("rails.png")`
#### JavaScript/CoffeeScript and ERB