aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorArthur Nogueira Neves <arthurnn@gmail.com>2014-06-24 10:51:58 -0500
committerArthur Nogueira Neves <arthurnn@gmail.com>2014-06-24 10:51:58 -0500
commit6bee389a0c06e557b0278ec013a7f915433260a8 (patch)
tree3ce75ad6cff824cc758ba66a6108b01cbbd5dea5 /guides
parenta1bd00d5be4f5bef34a259a053a00edede2cd2b5 (diff)
parentba11da1b57f9c219e1defe32e3a08685a060feb3 (diff)
downloadrails-6bee389a0c06e557b0278ec013a7f915433260a8.tar.gz
rails-6bee389a0c06e557b0278ec013a7f915433260a8.tar.bz2
rails-6bee389a0c06e557b0278ec013a7f915433260a8.zip
Merge pull request #15887 from RudyOnRails/patch-1
Improves readability of this line...
Diffstat (limited to 'guides')
-rw-r--r--guides/source/asset_pipeline.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index d984c5f27a..709f9583ec 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -494,10 +494,10 @@ file (if any) at the precise location of the `require_self` call. If
`require_self` is called more than once, only the last call is respected.
NOTE. If you want to use multiple Sass files, you should generally use the [Sass `@import` rule](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#import)
-instead of these Sprockets directives. Using Sprockets directives all Sass files exist within
+instead of these Sprockets directives. When using Sprockets directives, Sass files exist within
their own scope, making variables or mixins only available within the document they were defined in.
-You can do file globbing as well using `@import "*"`, and `@import "**/*"` to add the whole tree
-equivalent to how `require_tree` works. Check the [sass-rails documentation](https://github.com/rails/sass-rails#features) for more info and important caveats.
+
+You can do file globbing as well using `@import "*"`, and `@import "**/*"` to add the whole tree which is equivalent to how `require_tree` works. Check the [sass-rails documentation](https://github.com/rails/sass-rails#features) for more info and important caveats.
You can have as many manifest files as you need. For example, the `admin.css`
and `admin.js` manifest could contain the JS and CSS files that are used for the