aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-10-05 18:34:39 -0600
committerSean Griffin <sean@seantheprogrammer.com>2015-10-05 18:34:39 -0600
commit44ae2ef8c4f24340881c5015b35ebf43ddda5089 (patch)
treeefd6ad11d8b472b874d76d17e38308003e6f26df
parent4ddbd437c603baa6b0b8aa99b93d7b6e5d51ac3d (diff)
parentafe672185d5eba95f387c46f855ae7a21ea69fa5 (diff)
downloadrails-44ae2ef8c4f24340881c5015b35ebf43ddda5089.tar.gz
rails-44ae2ef8c4f24340881c5015b35ebf43ddda5089.tar.bz2
rails-44ae2ef8c4f24340881c5015b35ebf43ddda5089.zip
Merge pull request #21876 from kentendo/master
Update asset_pipeline.md [ci skip]
-rw-r--r--guides/source/asset_pipeline.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index 7b8d2d3aef..cc090e27e2 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -169,7 +169,7 @@ directory. Files in this directory are served by the Sprockets middleware.
Assets can still be placed in the `public` hierarchy. Any assets under `public`
will be served as static files by the application or web server when
-`config.serve_static_files` is set to true. You should use `app/assets` for
+`config.assets.serve_static_files` is set to true. You should use `app/assets` for
files that must undergo some pre-processing before they are served.
In production, Rails precompiles these files to `public/assets` by default. The