commit 92451a97271d014ab10ca4685beae728d53601b4
author David Friedman <dmail@google.com> Thu May 28 22:16:19 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 28 22:16:20 2015 +0000
tree 99c232e6da3369774066896bf897a705733bb19b
parent ed8c62955aa6512fb4e929e59893c774ae894358
parent 56d16c020c5a8507abbcefe7c637972184ea271f

Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs

docs/html-ndk/ndk/guides/abis.jd

diff --git a/docs/html-ndk/ndk/guides/abis.jd b/docs/html-ndk/ndk/guides/abis.jd
index ee55898..f4819b2 100644
--- a/docs/html-ndk/ndk/guides/abis.jd
+++ b/docs/html-ndk/ndk/guides/abis.jd
@@ -373,7 +373,7 @@
 
 <h3 id="mips64">mips64</h3>
 <p>This ABI is for MIPS64 R6. For more information, see
-<a href="http://www.imgtec.com/mips/architectures/mips64.asp">MIPS Architecture</a>.</p>
+<a href="http://www.imgtec.com/mips/architectures/mips64.asp">MIPS64 Architecture</a>.</p>
 
 <h2 id="gc">Generating Code for a Specific ABI</h2>
 <p>By default, the NDK generates machine code for the armeabi ABI. You can

docs/html-ndk/ndk/guides/android_mk.jd

diff --git a/docs/html-ndk/ndk/guides/android_mk.jd b/docs/html-ndk/ndk/guides/android_mk.jd
index 9c3c0ec..47fefc3 100644
--- a/docs/html-ndk/ndk/guides/android_mk.jd
+++ b/docs/html-ndk/ndk/guides/android_mk.jd
@@ -217,7 +217,7 @@
 TARGET_PLATFORM := android-22
 </pre>
 
-<h4>TARGET_ARCH_ABI</h4>
+<h4 id="taa">TARGET_ARCH_ABI</h4>
 <p>This variable stores the name of the CPU and architecture to target when the build system
 parses this {@code Android.mk} file. You can specify one or more of the following values, using
 a space as a delimiter between multiple targets. Table 1 shows the ABI setting to use for each

docs/html-ndk/ndk/guides/ndk-build.jd

diff --git a/docs/html-ndk/ndk/guides/ndk-build.jd b/docs/html-ndk/ndk/guides/ndk-build.jd
index 9e3edda..18ca2d8 100644
--- a/docs/html-ndk/ndk/guides/ndk-build.jd
+++ b/docs/html-ndk/ndk/guides/ndk-build.jd
@@ -46,10 +46,8 @@
 
 <p>In this example, <code>&lt;project&gt;</code> points to your
 project’s root directory, and <code>&lt;ndk&gt;</code> is the directory where
-you installed the NDK. As noted in <a
-href="{@docRoot}ndk/guides/setup.html#install">Setup</a>, you can add {@code $NDK} to your
-{@code PATH} to avoid having to type the whole filepath every time you use ndk-build.
-Alternatively, you can create an alias.</p>
+you installed the NDK.</p>
+
 <p><a class="anchor" id="options"></a> </p>
 <h3>Options</h3>
 <p>All parameters to ndk-build are passed directly to the underlying GNU {@code make}

docs/html-ndk/ndk/guides/standalone_toolchain.jd

diff --git a/docs/html-ndk/ndk/guides/standalone_toolchain.jd b/docs/html-ndk/ndk/guides/standalone_toolchain.jd
index 895f0fc..3b6f7f1 100644
--- a/docs/html-ndk/ndk/guides/standalone_toolchain.jd
+++ b/docs/html-ndk/ndk/guides/standalone_toolchain.jd
@@ -485,7 +485,7 @@
 
 <p>You don't have to use any specific compiler flag when targeting the MIPS ABI.</p>
 
-<p>To learn more about ABI support, see <a href="{@docRoot}ndk/guides/x86.html">x86</a>.</p>
+<p>To learn more about ABI support, see <a href="{@docRoot}ndk/guides/x86.html">x86 Support</a>.</p>
 
 <h2 id="war">Warnings and Limitations</h2>
 <h3>Windows support</h3>