aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2017-03-29 13:53:05 +0000
committerGravatar Philipp Wollermann <philwo@google.com>2017-03-29 19:28:07 +0200
commitc020c3d165735a2e668619bd79aa503e6f0a2615 (patch)
tree30da6a8eee8e8615757ccbbb7542765e72b6f864
parenta2ca62445e9b2aea54f194baca28adfef8512a6c (diff)
Changed "OS X" to "macOS (OS X)" to be consistent. Change was made to the doc, faq, and contribute topics.
Did not update content which is static: blog posts, release notes, design docs. PiperOrigin-RevId: 151569872
-rw-r--r--site/_layouts/documentation.html2
-rw-r--r--site/faq.md2
-rw-r--r--site/versions/master/docs/tutorial/app.md2
-rw-r--r--site/versions/master/docs/tutorial/environment.md2
-rw-r--r--site/versions/master/docs/tutorial/ios-app.md2
5 files changed, 5 insertions, 5 deletions
diff --git a/site/_layouts/documentation.html b/site/_layouts/documentation.html
index c2346de7be..7a8b93dfd1 100644
--- a/site/_layouts/documentation.html
+++ b/site/_layouts/documentation.html
@@ -36,7 +36,7 @@ version_prefix: /versions/master
<ul class="collapse sidebar-nav sidebar-submenu" id="installing-menu">
<li><a href="{{ page.version_prefix }}/docs/install.html">Installing Bazel</a></li>
<li><a href="{{ page.version_prefix }}/docs/install-ubuntu.html">Installing Bazel on Ubuntu</a></li>
- <li><a href="{{ page.version_prefix }}/docs/install-os-x.html">Installing Bazel on OS X</a></li>
+ <li><a href="{{ page.version_prefix }}/docs/install-os-x.html">Installing Bazel on macOS (OS X)</a></li>
<li><a href="{{ page.version_prefix }}/docs/install-windows.html">Installing Bazel on Windows</a></li>
<li><a href="{{ page.version_prefix }}/docs/install-compile-source.html">Compile Bazel from Source</a></li>
</ul>
diff --git a/site/faq.md b/site/faq.md
index 946e609d1f..9c4e5b1f94 100644
--- a/site/faq.md
+++ b/site/faq.md
@@ -178,7 +178,7 @@ Bazel shines at building and testing projects with the following properties:
Where can I run Bazel?
---------------------------------
-Currently, Linux and Mac OS X. Porting to other UNIX platforms should be
+Currently, Linux and macOS (OS X). Porting to other UNIX platforms should be
straightforward, as long as a JDK is available for the platform.
What about Windows?
diff --git a/site/versions/master/docs/tutorial/app.md b/site/versions/master/docs/tutorial/app.md
index fdc33c5f83..b3b274c2d5 100644
--- a/site/versions/master/docs/tutorial/app.md
+++ b/site/versions/master/docs/tutorial/app.md
@@ -6,7 +6,7 @@ title: Build Mobile Application
# Build Mobile Application
You can use Bazel to build a variety of software outputs, including
-Linux and Mac OS X applications written in Java, C++ and Objective-C. You can
+Linux and macOS (OS X) applications written in Java, C++ and Objective-C. You can
also use Bazel to build software for other platforms or written in other
languages.
diff --git a/site/versions/master/docs/tutorial/environment.md b/site/versions/master/docs/tutorial/environment.md
index 219060de7c..74ca13d322 100644
--- a/site/versions/master/docs/tutorial/environment.md
+++ b/site/versions/master/docs/tutorial/environment.md
@@ -11,7 +11,7 @@ Here, you'll do the following:
* Install Bazel
* Install Android Studio and the Android SDK
-* Install Xcode (OS X only)
+* Install Xcode (macOS (OS X) only)
* Get the sample project from the GitHub repo
## Install Bazel
diff --git a/site/versions/master/docs/tutorial/ios-app.md b/site/versions/master/docs/tutorial/ios-app.md
index 7e2f651698..55d3493509 100644
--- a/site/versions/master/docs/tutorial/ios-app.md
+++ b/site/versions/master/docs/tutorial/ios-app.md
@@ -22,7 +22,7 @@ Here, you'll do the following:
Note that, unlike with the Android app, you don't have to modify your
`WORKSPACE` file to add iOS-specific external dependencies.
-If you're following the steps in this tutorial on Mac OS X, you can go ahead
+If you're following the steps in this tutorial on macOS (OS X), you can go ahead
and build the sample iOS app as described below. If you are on Linux, skip ahead
to the [next step](backend-server.md).