Merge "docs: NDK r9 Release Notes (w/download size fix)" into jb-mr2-ub-dev
diff --git a/docs/html/about/versions/jelly-bean.jd b/docs/html/about/versions/jelly-bean.jd
index 503a95b..985a266 100644
--- a/docs/html/about/versions/jelly-bean.jd
+++ b/docs/html/about/versions/jelly-bean.jd
@@ -313,8 +313,7 @@
<p>VP8 encoding is available in software on all compatible devices running
Android 4.3. For highest performance, the platform also supports
-hardware-accelerated VP8 encoding on capable devices, such as Nexus 7 (2013),
-Nexus 4, and Nexus 10 devices.</p>
+hardware-accelerated VP8 encoding on capable devices.</p>
<h4 id="43-surface">Video encoding from a surface</h4>
@@ -452,7 +451,7 @@
platform versions through the Support Package in the Android SDK. </p>
<p>To assist you with managing date formatting across locales, Android 4.3
-includes a new <strong>getBestAvaialbleDate()</strong> method that automatically
+includes a new <strong>getBestDateTimePattern()</strong> method that automatically
generates the best possible localized form of a Unicode UTS date for a locale
that you specify. It’s a convenient way to provide a more localized experience
for your users. </p>
diff --git a/docs/html/guide/components/tasks-and-back-stack.jd b/docs/html/guide/components/tasks-and-back-stack.jd
index a21bf34..f818873 100644
--- a/docs/html/guide/components/tasks-and-back-stack.jd
+++ b/docs/html/guide/components/tasks-and-back-stack.jd
@@ -142,9 +142,8 @@
foreground—all three activities in its stack are intact and the activity at the top of the
stack resumes. At
this point, the user can also switch back to Task B by going Home and selecting the application icon
-that started that task (or by touching and holding the <em>Home</em> button to reveal recent tasks
-and selecting
-one). This is an example of multitasking on Android.</p>
+that started that task (or by selecting the app's task from the <em>recent apps</em> screen).
+This is an example of multitasking on Android.</p>
<p class="note"><strong>Note:</strong> Multiple tasks can be held in the background at once.
However, if the user is running many background tasks at the same time, the system might begin
diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd
index be58493..10ab61f 100644
--- a/docs/html/guide/topics/ui/actionbar.jd
+++ b/docs/html/guide/topics/ui/actionbar.jd
@@ -393,7 +393,7 @@
<meta-data android:name="android.support.UI_OPTIONS"
android:value="splitActionBarWhenNarrow" />
</activity>
-</manifest ...>
+</manifest>
</pre>
diff --git a/docs/html/tools/support-library/index.jd b/docs/html/tools/support-library/index.jd
index 420fa0f..87ed7f1 100644
--- a/docs/html/tools/support-library/index.jd
+++ b/docs/html/tools/support-library/index.jd
@@ -129,7 +129,7 @@
<dd>
<ul>
<li>Added {@link android.support.v7.app.ActionBar} to allow implementation of the
- action bar user interface <a href="{@docRoot}/design/patterns/actionbar.html">design
+ action bar user interface <a href="{@docRoot}design/patterns/actionbar.html">design
pattern</a> back to Android 2.1 (API level 7) and higher. Use of this class requires
that you implement your activity by extending the new
{@link android.support.v7.app.ActionBarActivity} class.</li>