mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #28079 from ck3g/rename-osx-to-macos
Update Guides to use macOS instead of Mac OS X [ci skip]
This commit is contained in:
commit
6c520b7528
5 changed files with 9 additions and 9 deletions
|
@ -242,7 +242,7 @@ Please refer to the [Changelog][railties] for detailed changes.
|
|||
[Pull Request](https://github.com/rails/rails/pull/22288))
|
||||
|
||||
* New applications are generated with the evented file system monitor enabled
|
||||
on Linux and Mac OS X. The feature can be opted out by passing
|
||||
on Linux and macOS. The feature can be opted out by passing
|
||||
`--skip-listen` to the generator.
|
||||
([commit](https://github.com/rails/rails/commit/de6ad5665d2679944a9ee9407826ba88395a1003),
|
||||
[commit](https://github.com/rails/rails/commit/94dbc48887bf39c241ee2ce1741ee680d773f202))
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
||||
|
|
|
@ -1308,7 +1308,7 @@ end
|
|||
Otherwise, in every request Rails walks the application tree to check if
|
||||
anything has changed.
|
||||
|
||||
On Linux and Mac OS X no additional gems are needed, but some are required
|
||||
On Linux and macOS no additional gems are needed, but some are required
|
||||
[for *BSD](https://github.com/guard/listen#on-bsd) and
|
||||
[for Windows](https://github.com/guard/listen#on-windows).
|
||||
|
||||
|
|
|
@ -46,7 +46,7 @@ $ cd rails
|
|||
|
||||
The test suite must pass with any submitted code. No matter whether you are writing a new patch, or evaluating someone else's, you need to be able to run the tests.
|
||||
|
||||
Install first SQLite3 and its development files for the `sqlite3` gem. Mac OS X
|
||||
Install first SQLite3 and its development files for the `sqlite3` gem. On macOS
|
||||
users are done with:
|
||||
|
||||
```bash
|
||||
|
|
|
@ -86,7 +86,7 @@ your prompt will look something like `c:\source_code>`
|
|||
|
||||
### Installing Rails
|
||||
|
||||
Open up a command line prompt. On Mac OS X open Terminal.app, on Windows choose
|
||||
Open up a command line prompt. On macOS open Terminal.app, on Windows choose
|
||||
"Run" from your Start menu and type 'cmd.exe'. Any commands prefaced with a
|
||||
dollar sign `$` should be run in the command line. Verify that you have a
|
||||
current version of Ruby installed:
|
||||
|
@ -98,7 +98,7 @@ ruby 2.3.1p112
|
|||
|
||||
TIP: A number of tools exist to help you quickly install Ruby and Ruby
|
||||
on Rails on your system. Windows users can use [Rails Installer](http://railsinstaller.org),
|
||||
while Mac OS X users can use [Tokaido](https://github.com/tokaido/tokaidoapp).
|
||||
while macOS users can use [Tokaido](https://github.com/tokaido/tokaidoapp).
|
||||
For more installation methods for most Operating Systems take a look at
|
||||
[ruby-lang.org](https://www.ruby-lang.org/en/documentation/installation/).
|
||||
|
||||
|
@ -206,7 +206,7 @@ folder directly to the Ruby interpreter e.g. `ruby bin\rails server`.
|
|||
TIP: Compiling CoffeeScript and JavaScript asset compression requires you
|
||||
have a JavaScript runtime available on your system, in the absence
|
||||
of a runtime you will see an `execjs` error during asset compilation.
|
||||
Usually Mac OS X and Windows come with a JavaScript runtime installed.
|
||||
Usually macOS and Windows come with a JavaScript runtime installed.
|
||||
Rails adds the `therubyracer` gem to the generated `Gemfile` in a
|
||||
commented line for new apps and you can uncomment if you need it.
|
||||
`therubyrhino` is the recommended runtime for JRuby users and is added by
|
||||
|
@ -221,7 +221,7 @@ your application in action, open a browser window and navigate to
|
|||
|
||||
TIP: To stop the web server, hit Ctrl+C in the terminal window where it's
|
||||
running. To verify the server has stopped you should see your command prompt
|
||||
cursor again. For most UNIX-like systems including Mac OS X this will be a
|
||||
cursor again. For most UNIX-like systems including macOS this will be a
|
||||
dollar sign `$`. In development mode, Rails does not generally require you to
|
||||
restart the server; changes you make in files will be automatically picked up by
|
||||
the server.
|
||||
|
|
Loading…
Reference in a new issue