Skip to content

Commit

Permalink
native_client_sdk: doc: fix macOS & Chrome OS naming
Browse files Browse the repository at this point in the history
Use the proper names for both of these in docs meant for public consumption.

Change-Id: Ia5f56ac791e5a743a3b59c5ccef2dea6a868c2b7
Reviewed-on: https://chromium-review.googlesource.com/1217546
Reviewed-by: Brad Nelson <bradnelson@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590208}
  • Loading branch information
vapier authored and Commit Bot committed Sep 11, 2018
1 parent 6b17e33 commit 96f54a6
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion native_client_sdk/src/doc/cds2014/cpp_summary.inc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ applicable.

Requirements:
* An x86 (sorry no arm) Desktop / Laptop
Windows, Mac, Linux, or ChromeOS browser
Windows, macOS, Linux, or Chrome OS browser
|cpp_check|
* A fast broadband connection (500MB download)
* Can read and write C++
Expand Down
2 changes: 1 addition & 1 deletion native_client_sdk/src/doc/cds2014/python_summary.inc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The techniques in this codelab also apply to other interpreted languages
we've ported to PNaCl, including: Python, Lua, Ruby, Tcl, Bash, and Forth.

Requirements:
* A Desktop / Laptop Windows, Mac, Linux, or ChromeOS browser
* A Desktop / Laptop Windows, macOS, Linux, or Chrome OS browser
|python_check|
* A fast broadband connection (500MB download)
* Can read and write Python
Expand Down
2 changes: 1 addition & 1 deletion native_client_sdk/src/doc/devguide/devcycle/building.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ embedded in web pages and execute them as part of a web application.

As explained in the Technical Overview, PNaCl modules are
operating-system-independent **and** processor-independent. The same **pexe**
will run on Windows, Mac OS X, Linux, and ChromeOS and it will run on x86-32,
will run on Windows, macOS, Linux, and Chrome OS and it will run on x86-32,
x86-64, ARM and MIPS processors.

Native Client also supports architecture-specific **nexe** files.
Expand Down
10 changes: 5 additions & 5 deletions native_client_sdk/src/doc/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Why did Google build Native Client?
* **Portability:** Native Client and Portable Native Client applications
can execute on:

* The Windows, Mac, Linux or ChromeOS operating systems.
* The Windows, macOS, Linux or Chrome OS operating systems.
* Processors with the x86-32, x86-64, or ARM instruction set
architectures. Native Client also has experimental support for MIPS.

Expand Down Expand Up @@ -163,16 +163,16 @@ Development Environments and Tools
What development environment and development operating system do you recommend?
-------------------------------------------------------------------------------

You can develop on Windows, Mac, or Linux, and the resulting Native Client or
You can develop on Windows, macOS, or Linux, and the resulting Native Client or
Portable Native Client application will run inside the Google Chrome browser on
all those platforms as well as ChromeOS. You can also develop on ChromeOS with
all those platforms as well as Chrome OS. You can also develop on Chrome OS with
Crouton_ or our `experimental development environment which runs within NaCl`_,
and we're working on self-hosting a full development environment on Portable
Native Client.

Any editor+shell combination should work as well as IDEs like Eclipse,
Visual Studio with the :doc:`Native Client Add-In
<devguide/devcycle/vs-addin>` on Windows, or Xcode on Mac OSX.
<devguide/devcycle/vs-addin>` on Windows, or Xcode on macOS.

I'm not familiar with native development tools, can I still use the Native Client SDK?
--------------------------------------------------------------------------------------
Expand Down Expand Up @@ -538,7 +538,7 @@ My ``.pexe`` isn't loading, help!
Client. Find your version of chrome by opening ``about:chrome``, and `update
Chrome <http://www.google.com/chrome/>`_ if you are on an older version. If
you're already using a recent version, open ``about:components`` and "Check
for update" for PNaCl. Note that on ChromeOS PNaCl is always up to date,
for update" for PNaCl. Note that on Chrome OS PNaCl is always up to date,
whereas on other operating systems it updates shortly after Chrome updates.
* A PNaCl ``.pexe`` must be compiled with pepper_31 SDK or higher. :ref:`Update
your bundles <updating-bundles>` and make sure you're using a version of
Expand Down
2 changes: 1 addition & 1 deletion native_client_sdk/src/doc/migration/deprecation.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<b><font color="#cc0000">
NOTE:
Deprecation of the technologies described here has been announced
for platforms other than ChromeOS.<br/>
for platforms other than Chrome OS.<br/>
Please visit our
<a href="/native-client/migration">migration guide</a>
for details.
Expand Down
2 changes: 1 addition & 1 deletion native_client_sdk/src/doc/migration/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ web apps and that usage of PNaCl is sufficiently low to warrant deprecation.
We also recently announced the deprecation Q1 2018 of
`Chrome Apps
<https://blog.chromium.org/2016/08/from-chrome-apps-to-web.html>`_
outside of ChromeOS.
outside of Chrome OS.


Toolchain Migration
Expand Down
6 changes: 3 additions & 3 deletions native_client_sdk/src/doc/sdk/download.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ Make
Platforms
---------

Native Client supports several operating systems, including Windows, Linux, OSX,
and ChromeOS. It supports several architectures including on x86-32, x86-64,
ARM, and MIPS.
Native Client supports several operating systems, including Windows, Linux,
macOS, and Chrome OS. It supports several architectures including on x86-32,
x86-64, ARM, and MIPS.

.. _versioning:

Expand Down

0 comments on commit 96f54a6

Please sign in to comment.