am 76342acf: am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3.

* commit '76342acf89cf19b42a3671ea48b2f0264c0ce484':
  Doc change: misc fixes for preview 3.

docs/html/index.jd

@@ -22,9 +22,9 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3
         <h1 class="dac-hero-title" style="white-space:nowrap;">Android 6.0 Marshmallow</h1>
         </div>
         <div class="col-6of16 col-push-1of16">
-        <p class="dac-hero-description"><strong>The official Android 6.0
+        <p class="dac-hero-description" style="color:white"><strong>The
-        SDK is now available!</strong> Update to Developer Preview 3
+        official Android 6.0 SDK is now available!</strong> Update to
-        and get your apps ready for Android Marshmallow!</p>
+        Developer Preview 3 and get your apps ready for Android Marshmallow!</p>
 
         <a class="dac-hero-cta" href="/preview/index.html">
           <span class="dac-sprite dac-auto-chevron"></span>

docs/html/preview/overview.jd

@@ -164,7 +164,8 @@ page.tags="preview", "developer", "android"
   </li>
 
   <li>
-    <strong><a href="{@docRoot}preview/download.html">Preview&nbsp;3</a></strong> (final APIs and official Android 6.0 SDK, available).
+  <strong><a href="{@docRoot}preview/download.html">Preview&nbsp;3</a></strong>
+    (final APIs and official Android 6.0 SDK, available).
   </li>
 </ul>
 
@@ -336,12 +337,12 @@ page.tags="preview", "developer", "android"
   to <code>“23”</code>.
 </p>
 
-  <p>Before releasing your app targeting API level 23, we strongly
+  <p>Before releasing an app that targets API level 23, we strongly
   recommend distributing it to a group of testers through the new <a
-  href="http://android-developers.blogspot.com/2015/07/iterate-faster-on-google-play-with.html">
+  href="http://android-developers.blogspot.com/2015/07/iterate-faster-on-google-play-with.html"> 
   beta testing features available in the Google Play Developer Console. See the
   <a href="https://support.google.com/googleplay/android-developer/answer/3131213">Help
-  Center article</a> for more information.
+  Center article</a> for more information. 
 </p>
 
 <h2 id="get_started">

docs/html/preview/setup-sdk.jd

@@ -1,4 +1,4 @@
-page.title=Set Up the Preview SDK
+page.title=Set Up the SDK
 page.image=images/cards/card-set-up_16-9_2x.png
 
 @jd:body
@@ -9,14 +9,14 @@ page.image=images/cards/card-set-up_16-9_2x.png
     <h2>In this document</h2>
       <ol>
         <li><a href="#get-as13">Get Android Studio 1.3</a></li>
-        <li><a href="#get-sdk">Get the Preview SDK</a></li>
+        <li><a href="#get-sdk">Get the Android 6.0 SDK</a></li>
         <li><a href="#create-update">Create or Update a Project</a></li>
         <li><a href="#setup-test">Set Up for Testing</a></li>
       </ol>
   </div>
 </div>
 
-<p>With Developer Preview 3, the official Android 6.0 SDK is now available from the Android SDK
+<p>With Developer Preview 3, the <strong>official Android 6.0 SDK is now available</strong> from the Android SDK
 Manager. This document assumes that you are familiar with Android app development, such
 as using the Android SDK Manager and creating projects. If you are new to
 Android, see <a href="{@docRoot}training/basics/firstapp/index.html">Building Your First
@@ -26,17 +26,16 @@ App</a> training lesson first.</p>
 <h2 id="get-as13">Get Android Studio 1.3</h2>
 
 <p>
-  The Developer Preview is best used with Android Studio 1.3. It is highly recommended that
+  It is highly recommended that you install the Android Studio 1.3 to work best with
-  you install the Android Studio 1.3 to work with the Preview SDK and the final Android 6.0 SDK
+  the Android 6.0 SDK. Please update your Android Studio installation to version 1.3 or
-  provided with Preview 3. Please update your Android Studio installation to version 1.3 or
   higher, or follow the instructions for
   <a href="{@docRoot}sdk/installing/index.html?pkg=studio">Installing Android Studio</a>.
 </p>
 
 
-<h2 id="get-sdk">Get the Preview SDK</h2>
+<h2 id="get-sdk">Get the Android 6.0 SDK</h2>
 
-<p>To add the Preview SDK components to your development environment:</p>
+<p>To add the Android 6.0 SDK components to your development environment:</p>
 
 <ol>
   <li>Launch Android Studio 1.3 or higher.
@@ -61,8 +60,7 @@ App</a> training lesson first.</p>
   standalone application.)
   </li>
 
-  <li>Under the <strong>Platforms</strong> section, select <strong>Android MNC
+  <li>Under the <strong>Platforms</strong> section, select <strong>Android 6.0</strong>.
-  Preview</strong>.
   </li>
 
   <li>In the <strong>Tools</strong> section, select the latest Android <strong>
@@ -74,13 +72,12 @@ App</a> training lesson first.</p>
     agreement for all of the packages.
   </li>
 
-  <li>Verify that the M Developer Preview is installed by opening the <strong>
+  <li>Verify that the Android 6.0 SDK is installed by opening the <strong>
     Settings</strong> window and choosing the <strong>Appearance &amp; Behavior
     &gt; System Settings &gt; Android SDK</strong> panel.</li>
 
   <li>On the <strong>Android SDK</strong> panel, choose
-    the <strong>SDK Platforms</strong> tab. <strong>Android MNC
+    the <strong>SDK Platforms</strong> tab. <strong>Android 6.0</strong> should be listed as <em>Installed</em>. Also, open the
-    Preview</strong> should be listed as <em>Installed</em>. Also, open the
     <strong>SDK Tools</strong> tab to verify that the latest tools are
     installed.
   </li>
@@ -116,8 +113,9 @@ App</a> training lesson first.</p>
 <h3 id="update">Update an existing project</h3>
 
 <p>
-  For existing projects, you must modify the project configuration to enable the preview APIs. In
+  For existing projects, if you are using Android 6.0 APIs (API level 23) you must
-  your development environment, open the <code>build.gradle</code> file for your module and
+  modify the project configuration. In your development environment, open the
+  <code>build.gradle</code> file for your module and
   set these values as follows:
 </p>
 

docs/html/preview/support.jd

@@ -149,8 +149,16 @@ page.image=images/cards/card-support_16-9_2x.png
 <h3 id="changes">
   Key changes
 </h3>
-
 <ul>
+  <li>General
+  <ul>
+  <li>Final Permissions user interface &mdash; the permissions user interface is updated
+  and some of the permissions behaviors are enhanced. </li>
+  <li>Updates to the Fingerprint API &mdash; updated API that enables better error reporting,
+  better fingerprint enrollment experience, plus enumeration support for greater
+  reliability.</li>
+  </ul>
+  </li>
   <li>Permission changes
     <ul>
       <li>The {@link android.Manifest.permission#GET_ACCOUNTS} permission is now a member of the
@@ -180,7 +188,7 @@ page.image=images/cards/card-support_16-9_2x.png
 <ul>
   <li>General issues:
     <ul>
-      <li>On LTE devices, including volantis, GPS is not functioning properly, which may
+      <li>On LTE devices, including Nexus 9, GPS is not functioning properly, which may
         interfere with navigation services.
       </li>
       <li>During Hangouts calls, users may experience distorted or low audio on some devices.