summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-12 00:13:47 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-12 00:13:47 +0000
commit17796e61ca6326500b8f305bcbc8105a63d8f5f4 (patch)
tree9d84e67335e2c307039899e7f2f0729aa870d4ca /native_client_sdk
parentfa8f7306a47f7f3595ea9a8565c715532a85d907 (diff)
downloadchromium_src-17796e61ca6326500b8f305bcbc8105a63d8f5f4.zip
chromium_src-17796e61ca6326500b8f305bcbc8105a63d8f5f4.tar.gz
chromium_src-17796e61ca6326500b8f305bcbc8105a63d8f5f4.tar.bz2
NaCl docs: Fix various nits
"Wide variety" shouldn't be hyphenated. "Command line" is usually two words. "C compiler" is not usually hyphenated. .a archives are the same thing as static libraries, so say "i.e." rather than "e.g.". "-o" is usually written with a space after. Clean up some link texts. BUG=none TEST="make" in native_client_sdk/src/doc Review URL: https://codereview.chromium.org/68263005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
-rw-r--r--native_client_sdk/src/doc/devguide/devcycle/building.rst20
-rw-r--r--native_client_sdk/src/doc/devguide/devcycle/debugging.rst4
2 files changed, 12 insertions, 12 deletions
diff --git a/native_client_sdk/src/doc/devguide/devcycle/building.rst b/native_client_sdk/src/doc/devguide/devcycle/building.rst
index 3cec584..eb30aeb 100644
--- a/native_client_sdk/src/doc/devguide/devcycle/building.rst
+++ b/native_client_sdk/src/doc/devguide/devcycle/building.rst
@@ -35,7 +35,7 @@ any processor, e.g., x86-32, x86-64, and ARM.
Native Client also supports architecture-specific **nexe** files.
These **nexe** files are **also** operating-system-independent,
-but they are **not** processor-independent. To support a wide-variety of
+but they are **not** processor-independent. To support a wide variety of
devices you must compile separate versions of your Native Client module
for different processors on end-user machines. A
:ref:`manifest file <application_files>` will then specify which version
@@ -142,9 +142,9 @@ The PNaCl toolchain
===================
The PNaCl toolchain contains modified versions of the tools in the
-LLVM toolchain, as wells as linkers and other tools from binutils.
+LLVM toolchain, as well as linkers and other tools from binutils.
To determine which version of LLVM or binutils the tools are based upon,
-run the tool with the ``--version`` commandline flag. These tools
+run the tool with the ``--version`` command line flag. These tools
are used to compile and link applications into .pexe files. The toolchain
also contains a tool to translate a .pexe file into a
architecture-specific .nexe (e.g., for debugging purposes).
@@ -155,11 +155,11 @@ tools include:
pnacl-abicheck
Check that the **pexe** follows the PNaCl ABI rules.
pnacl-ar
- Creates archives (e.g., static libraries)
+ Creates archives (i.e., static libraries)
pnacl-clang
- C-compiler and compiler driver
+ C compiler and compiler driver
pnacl-clang++
- C++-compiler and compiler driver
+ C++ compiler and compiler driver
pnacl-dis
Disassembler for both **pexe** files and **nexe** files
pnacl-finalize
@@ -169,7 +169,7 @@ pnacl-ld
pnacl-nm
Lists symbols in bitcode files, native code, and libraries
pnacl-ranlib
- Generates a symbol table for archives (e.g., static libraries)
+ Generates a symbol table for archives (i.e., static libraries)
pnacl-translate
Translates a **pexe** to a native architecture, outside of the browser
@@ -216,7 +216,7 @@ separate bitcode files. For example:
<NACL_SDK_ROOT>/toolchain/win_pnacl/bin/pnacl-clang++ hello_world.cc ^
-I<NACL_SDK_ROOT>/include -c -o hello_world.o -g -O0
-For a description of each commandline flag, run ``pnacl-clang --help``.
+For a description of each command line flag, run ``pnacl-clang --help``.
For convenience, here is a description of some of the flags used in
the example.
@@ -227,7 +227,7 @@ the example.
rather than continue the build process and link together the
full application.
-``-o<output_file>``
+``-o <output_file>``
indicates the **output** filename.
``-g``
@@ -330,7 +330,7 @@ Besides the PNaCl toolchain, the Native Client SDK also includes modified
versions of the tools in the standard GNU toolchain, including the GCC
compilers and the linkers and other tools from binutils. These tools only
support building **nexe** files. Run the tool with the ``--version``
-commandline flag to determine the current version of the tools.
+command line flag to determine the current version of the tools.
Each tool in the toolchain is prefixed with the name of the target
architecture. In the toolchain for the ARM target architecture, each
diff --git a/native_client_sdk/src/doc/devguide/devcycle/debugging.rst b/native_client_sdk/src/doc/devguide/devcycle/debugging.rst
index 2ef99f9..878f08c 100644
--- a/native_client_sdk/src/doc/devguide/devcycle/debugging.rst
+++ b/native_client_sdk/src/doc/devguide/devcycle/debugging.rst
@@ -189,7 +189,7 @@ the calls to stderr.
Debugging with Visual Studio
----------------------------
-If you develop on a Windows platform you can use the Native :doc:`Client Visual
+If you develop on a Windows platform you can use the :doc:`Native Client Visual
Studio add-in <vs-addin>` to write and debug your code. The add-in defines new
project platforms that let you run your module in two different modes: As a
Pepper plugin and as a Native Client module. When running as a Pepper plugin
@@ -419,7 +419,7 @@ Debugging with other tools
If you cannot use the :ref:`Visual Studio add-in <visual_studio>`, or you want
to use a debugger other than nacl-gdb, you must manually build your module as a
-Pepper plugin (sometimes referred to as a `"trusted
+Pepper plugin (sometimes referred to as a "`trusted
<http://www.chromium.org/nativeclient/getting-started/getting-started-background-and-basics#TOC-Trusted-vs-Untrusted>`_"
or "in-process" plugin). Pepper plugins (.DLL files on Windows; .so files on
Linux; .bundle files on Mac) are loaded directly in either the Chrome renderer