From 90042a5f8c987582736f4eed714aeba9416003c6 Mon Sep 17 00:00:00 2001
From: David Friedman <dmail@google.com>
Date: Thu, 28 May 2015 21:07:46 -0700
Subject: Docs: Corrects technical content of one sentence, and deletes
 another.

Change-Id: Iaf894f9d9d68e4e2be9a1d1f8173b83a781241f4
---
 docs/html-ndk/ndk/guides/application_mk.jd |  2 +-
 docs/html-ndk/ndk/guides/concepts.jd       | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'docs/html-ndk')

diff --git a/docs/html-ndk/ndk/guides/application_mk.jd b/docs/html-ndk/ndk/guides/application_mk.jd
index fab611b..1294687 100644
--- a/docs/html-ndk/ndk/guides/application_mk.jd
+++ b/docs/html-ndk/ndk/guides/application_mk.jd
@@ -12,7 +12,7 @@ page.title=Application.mk
     </div>
   </div>
 
-<p>This document explains the syntax of the {@code Application.mk} build file, which describes the
+<p>This document explains the {@code Application.mk} build file, which describes the
 native <em>modules</em> that your app requires. A module can be a static library, a shared library,
 or an executable.</p>
 
diff --git a/docs/html-ndk/ndk/guides/concepts.jd b/docs/html-ndk/ndk/guides/concepts.jd
index c2eccd4..0601f21 100644
--- a/docs/html-ndk/ndk/guides/concepts.jd
+++ b/docs/html-ndk/ndk/guides/concepts.jd
@@ -115,20 +115,22 @@ ARMEABI (default), MIPS, and x86. For more information, see
 </li>
 </ul>
 
-<p>The following two items only apply in cases in which you are using the toolchains provided with
-the Android NDK as standalone compilers.</p>
+<p>The following two items are only required for building using the
+<a href="{@docRoot}ndk/guides/ndk-build.html">{@code ndk-build}</a> script,
+and for debugging using the <a href="{@docRoot}ndk/guides/ndk-gdb.html">
+{@code ndk-gdb}</a> script.
 
 <ul>
-<li>{@code Android.mk}: You must create an <a href="{@docRoot}ndk/guides/android_mk.html">
-{@code Android.mk}</a> configuration file inside your {@code jni} folder. The ndk-build script
-looks at this file, which defines the module and its name, the source files to be compiled, build
-flags and libraries to link.</li>
+<li><a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a>:
+You must create an <a href="{@docRoot}ndk/guides/android_mk.html">
+{@code Android.mk}</a> configuration file inside your {@code jni} folder. The {@code ndk-build}
+script looks at this file, which defines the module and its name, the source files to be compiled,
+build flags and libraries to link.</li>
 </ul>
 
 <ul>
-<li>{@code Application.mk}: You may optionally create an
-<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file. This file
-This file enumerates and describes the modules that your app requires. This information includes:
+<li><a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a>: This file
+enumerates and describes the modules that your app requires. This information includes:
 
 <ul>
 <li>ABIs used to compile for specific platforms.</li>
-- 
cgit v1.1