about summary refs log tree commit diff
path: root/src/doc/reference
diff options
context:
space:
mode:
authorPaul Merrill <pdm@pdm.me>2017-02-25 15:46:10 -0800
committerPaul Merrill <pdm@pdm.me>2017-02-25 15:47:41 -0800
commit1eb34326736a67ba748d0bf608031952b7eb1c91 (patch)
tree9dcbeb1d3bee18b808105f50f2e640154b5bdf56 /src/doc/reference
parent1572bf104dbf65d58bd6b889fa46229c9b92d6f9 (diff)
downloadrust-1eb34326736a67ba748d0bf608031952b7eb1c91.tar.gz
rust-1eb34326736a67ba748d0bf608031952b7eb1c91.zip
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 name current product brand of macOS.
Diffstat (limited to 'src/doc/reference')
-rw-r--r--src/doc/reference/src/attributes.md2
-rw-r--r--src/doc/reference/src/linkage.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/reference/src/attributes.md b/src/doc/reference/src/attributes.md
index 8f3fdbf3679..31814ef8c57 100644
--- a/src/doc/reference/src/attributes.md
+++ b/src/doc/reference/src/attributes.md
@@ -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() {
   // ...
diff --git a/src/doc/reference/src/linkage.md b/src/doc/reference/src/linkage.md
index 4755e4be8b6..28297a8ec1f 100644
--- a/src/doc/reference/src/linkage.md
+++ b/src/doc/reference/src/linkage.md
@@ -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