Skip to content

doc: Use "macOS" terminology consistently #40102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/doc/book/src/ffi.md
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ libraries:
* Static - `#[link(name = "my_build_dependency", kind = "static")]`
* Frameworks - `#[link(name = "CoreFoundation", kind = "framework")]`

Note that frameworks are only available on OSX targets.
Note that frameworks are only available on macOS targets.

The different `kind` values are meant to differentiate how the native library
participates in linkage. From a linkage perspective, the Rust compiler creates
Expand Down Expand Up @@ -437,7 +437,7 @@ A few examples of how this model can be used are:
is included in a final target (like a binary), the native library will be
linked in.

On OSX, frameworks behave with the same semantics as a dynamic library.
On macOS, frameworks behave with the same semantics as a dynamic library.

# Unsafe blocks

Expand Down
4 changes: 2 additions & 2 deletions src/doc/book/src/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ fn main() {
}
```

Save the file, and go back to your terminal window. On Linux or OSX, enter the
Save the file, and go back to your terminal window. On Linux or macOS, enter the
following commands:

```bash
Expand Down Expand Up @@ -253,7 +253,7 @@ $ rustc main.rs

If you come from a C or C++ background, you'll notice that this is similar to
`gcc` or `clang`. After compiling successfully, Rust should output a binary
executable, which you can see on Linux or OSX by entering the `ls` command in
executable, which you can see on Linux or macOS by entering the `ls` command in
your shell as follows:

```bash
Expand Down
2 changes: 1 addition & 1 deletion src/doc/reference/src/attributes.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ command line using `--cfg` (e.g. `rustc main.rs --cfg foo --cfg 'bar="baz"'`).
Rust code then checks for their presence using the `#[cfg(...)]` attribute:

```
// The function is only included in the build when compiling for OSX
// The function is only included in the build when compiling for macOS
#[cfg(target_os = "macos")]
fn macos_only() {
// ...
Expand Down
2 changes: 1 addition & 1 deletion src/doc/reference/src/linkage.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ be ignored in favor of only building the artifacts specified by command line.
* `--crate-type=cdylib`, `#[crate_type = "cdylib"]` - A dynamic system
library will be produced. This is used when compiling Rust code as
a dynamic library to be loaded from another language. This output type will
create `*.so` files on Linux, `*.dylib` files on OSX, and `*.dll` files on
create `*.so` files on Linux, `*.dylib` files on macOS, and `*.dll` files on
Windows.

* `--crate-type=rlib`, `#[crate_type = "rlib"]` - A "Rust library" file will be
Expand Down