From 2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8 Mon Sep 17 00:00:00 2001 From: Godfrey Chan Date: Fri, 19 Dec 2014 14:16:29 -0800 Subject: Merge pull request #18100 from chancancode/serve_static_files Allow static asset serving from env variable (enhanced!) Conflicts: railties/CHANGELOG.md --- guides/source/rails_on_rack.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'guides/source/rails_on_rack.md') 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`** -- cgit v1.2.3