aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/asset_pipeline.md
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2017-02-20 15:17:29 +0100
committerGitHub <noreply@github.com>2017-02-20 15:17:29 +0100
commit6c520b75286aa5969de427c5aa417061bd7c58bc (patch)
tree211a1843266d9e82a6fe20c43c2a9020ad90ea66 /guides/source/asset_pipeline.md
parent71da39097b67114329be6d8db7fe6911124531af (diff)
parent7718d470e9027fb1925237be65ba82f3ace660df (diff)
downloadrails-6c520b75286aa5969de427c5aa417061bd7c58bc.tar.gz
rails-6c520b75286aa5969de427c5aa417061bd7c58bc.tar.bz2
rails-6c520b75286aa5969de427c5aa417061bd7c58bc.zip
Merge pull request #28079 from ck3g/rename-osx-to-macos
Update Guides to use macOS instead of Mac OS X [ci skip]
Diffstat (limited to 'guides/source/asset_pipeline.md')
-rw-r--r--guides/source/asset_pipeline.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index 360de9a584..68dde4482f 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -207,7 +207,7 @@ default .coffee and .scss files will not be precompiled on their own. See
precompiling works.
NOTE: You must have an ExecJS supported runtime in order to use CoffeeScript.
-If you are using Mac OS X or Windows, you have a JavaScript runtime installed in
+If you are using macOS or Windows, you have a JavaScript runtime installed in
your operating system. Check [ExecJS](https://github.com/rails/execjs#readme) documentation to know all supported JavaScript runtimes.
You can also disable generation of controller specific asset files by adding the
@@ -1117,7 +1117,7 @@ config.assets.js_compressor = :uglifier
```
NOTE: You will need an [ExecJS](https://github.com/rails/execjs#readme)
-supported runtime in order to use `uglifier`. If you are using Mac OS X or
+supported runtime in order to use `uglifier`. If you are using macOS or
Windows you have a JavaScript runtime installed in your operating system.