diff options
author | Godfrey Chan <godfreykfc@gmail.com> | 2014-12-19 14:16:29 -0800 |
---|---|---|
committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-12-19 14:55:34 -0800 |
commit | 2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8 (patch) | |
tree | 842f600e072f0ed0b13062a82f36cb7be6129433 /guides/source/rails_on_rack.md | |
parent | 352680c1d394a2177437f20673ede0753d651913 (diff) | |
download | rails-2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8.tar.gz rails-2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8.tar.bz2 rails-2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8.zip |
Merge pull request #18100 from chancancode/serve_static_files
Allow static asset serving from env variable (enhanced!)
Conflicts:
railties/CHANGELOG.md
Diffstat (limited to 'guides/source/rails_on_rack.md')
-rw-r--r-- | guides/source/rails_on_rack.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/rails_on_rack.md b/guides/source/rails_on_rack.md index 0dec0e139b..042ebde9bb 100644 --- a/guides/source/rails_on_rack.md +++ b/guides/source/rails_on_rack.md @@ -233,7 +233,7 @@ Much of Action Controller's functionality is implemented as Middlewares. The fol **`ActionDispatch::Static`** -* Used to serve static assets. Disabled if `config.serve_static_assets` is `false`. +* Used to serve static files. Disabled if `config.serve_static_files` is `false`. **`Rack::Lock`** |