aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorScott Bronson <brons_git@rinspin.com>2016-03-18 14:40:45 -0700
committerScott Bronson <brons_git@rinspin.com>2016-03-18 16:19:25 -0700
commitbcad7cebd46e8117aabebe4b2ae2e06bb64632dd (patch)
tree46dc0e9022b45e5661456a315af9c63652b29d2e /guides
parenta4ef62279d69d901b99fe0e71338b5aaebab01c0 (diff)
downloadrails-bcad7cebd46e8117aabebe4b2ae2e06bb64632dd.tar.gz
rails-bcad7cebd46e8117aabebe4b2ae2e06bb64632dd.tar.bz2
rails-bcad7cebd46e8117aabebe4b2ae2e06bb64632dd.zip
remove Rails 4 text from asset pipeline guide
Diffstat (limited to 'guides')
-rw-r--r--guides/source/asset_pipeline.md10
1 files changed, 3 insertions, 7 deletions
diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index c3b9e4c2ed..cc3da47db9 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -25,13 +25,9 @@ It allows assets in your application to be automatically combined with assets
from other gems. For example, jquery-rails includes a copy of jquery.js
and enables AJAX features in Rails.
-The asset pipeline is technically no longer a core feature from Rails 4 onwards -- it has
-been extracted out of the framework into the
-[sprockets-rails](https://github.com/rails/sprockets-rails) gem.
-
-The asset pipeline is enabled by default.
-
-You can disable the asset pipeline while creating a new application by
+The asset pipeline is implemented by the
+[sprockets-rails](https://github.com/rails/sprockets-rails) gem,
+and is enabled by default. You can disable it while creating a new application by
passing the `--skip-sprockets` option.
```bash