Skip to content

Commit 8e08bd6

Browse files
committed
Auto merge of #40102 - pmer:pmer/use-macos-term-in-docs, r=steveklabnik
doc: Use "macOS" terminology consistently One line in the documentation used the term macOS while the other six used OSX. Be consistent and use the current product brand of macOS.
2 parents 60a0edc + 1eb3432 commit 8e08bd6

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/doc/book/src/ffi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ libraries:
408408
* Static - `#[link(name = "my_build_dependency", kind = "static")]`
409409
* Frameworks - `#[link(name = "CoreFoundation", kind = "framework")]`
410410
411-
Note that frameworks are only available on OSX targets.
411+
Note that frameworks are only available on macOS targets.
412412
413413
The different `kind` values are meant to differentiate how the native library
414414
participates in linkage. From a linkage perspective, the Rust compiler creates
@@ -437,7 +437,7 @@ A few examples of how this model can be used are:
437437
is included in a final target (like a binary), the native library will be
438438
linked in.
439439
440-
On OSX, frameworks behave with the same semantics as a dynamic library.
440+
On macOS, frameworks behave with the same semantics as a dynamic library.
441441
442442
# Unsafe blocks
443443

src/doc/book/src/getting-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ fn main() {
167167
}
168168
```
169169

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

173173
```bash
@@ -253,7 +253,7 @@ $ rustc main.rs
253253

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

259259
```bash

src/doc/reference/src/attributes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ command line using `--cfg` (e.g. `rustc main.rs --cfg foo --cfg 'bar="baz"'`).
219219
Rust code then checks for their presence using the `#[cfg(...)]` attribute:
220220

221221
```
222-
// The function is only included in the build when compiling for OSX
222+
// The function is only included in the build when compiling for macOS
223223
#[cfg(target_os = "macos")]
224224
fn macos_only() {
225225
// ...

src/doc/reference/src/linkage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ be ignored in favor of only building the artifacts specified by command line.
4646
* `--crate-type=cdylib`, `#[crate_type = "cdylib"]` - A dynamic system
4747
library will be produced. This is used when compiling Rust code as
4848
a dynamic library to be loaded from another language. This output type will
49-
create `*.so` files on Linux, `*.dylib` files on OSX, and `*.dll` files on
49+
create `*.so` files on Linux, `*.dylib` files on macOS, and `*.dll` files on
5050
Windows.
5151

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

0 commit comments

Comments
 (0)