diff options
| -rw-r--r-- | README.md | 12 | ||||
| -rw-r--r-- | docs/HACKING_QUICKSTART.md | 2 | ||||
| -rw-r--r-- | docs/STYLE_GUIDE.md | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/README.md b/README.md index 3203fe3e350..3f55f7eee54 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Servo is a prototype web browser engine written in the [Rust](https://github.com/rust-lang/rust) language. It is currently developed on -64-bit OS X, 64-bit Linux, 64-bit Windows, and Android. +64-bit macOS, 64-bit Linux, 64-bit Windows, and Android. Servo welcomes contribution from everyone. See [`CONTRIBUTING.md`](CONTRIBUTING.md) and [`HACKING_QUICKSTART.md`](docs/HACKING_QUICKSTART.md) @@ -41,7 +41,7 @@ https://github.com/rust-lang-nursery/rustup.rs/#other-installation-methods) ### Other dependencies Please select your operating system: -* [OS X](#os-x) +* [macOS](#macos) * [Debian-based Linuxes](#on-debian-based-linuxes) * [Fedora](#on-fedora) * [Arch Linux](#on-arch-linux) @@ -50,19 +50,19 @@ Please select your operating system: * [Microsoft Windows](#on-windows-msvc) * [Android](#cross-compilation-for-android) -#### OS X -#### On OS X (homebrew) +#### macOS +#### On macOS (homebrew) ``` sh brew install automake pkg-config python cmake yasm pip install virtualenv ``` -#### On OS X (MacPorts) +#### On macOS (MacPorts) ``` sh sudo port install python27 py27-virtualenv cmake yasm ``` -#### On OS X >= 10.11 (El Capitan), you also have to install OpenSSL +#### On macOS >= 10.11 (El Capitan), you also have to install OpenSSL ``` sh brew install openssl diff --git a/docs/HACKING_QUICKSTART.md b/docs/HACKING_QUICKSTART.md index c417fa4f25b..69b99c419e6 100644 --- a/docs/HACKING_QUICKSTART.md +++ b/docs/HACKING_QUICKSTART.md @@ -153,7 +153,7 @@ A typical command might be: … to avoid using too many threads and make things easier to understand. -On OSX, you can add some Cocoa-specific debug options: +On macOS, you can add some Cocoa-specific debug options: ``` shell ./mach run -d -- /tmp/a.html -- -NSShowAllViews YES diff --git a/docs/STYLE_GUIDE.md b/docs/STYLE_GUIDE.md index b7a3e519b42..49f69e65855 100644 --- a/docs/STYLE_GUIDE.md +++ b/docs/STYLE_GUIDE.md @@ -13,7 +13,7 @@ Shell scripts should be written against bash, starting with this shebang: #!/usr/bin/env bash ``` -Note that the version of bash available on OS X by default is quite old, so be +Note that the version of bash available on macOS by default is quite old, so be careful when using new features. Scripts should enable a few options at the top for robustness: |