diff --git a/docs/html/index.jd b/docs/html/index.jd
index eef7929..609d78a 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -22,15 +22,16 @@
         <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>Final SDK is now available!</strong> Get your apps ready for the next version
-        of Android. Test on Nexus 5, 6, 9, and Player.</p>
+        <p class="dac-hero-description"><strong>The official Android 6.0
+        SDK is now available!</strong> Update to 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>
           Get started
         </a><br>
 
-        <a class="dac-hero-cta" href="/preview/support.html">
+        <a class="dac-hero-cta mprev" href="/preview/support.html">
           <span class="dac-sprite dac-auto-chevron"></span>
           Update to Developer Preview 3 (final SDK)
         </a>
diff --git a/docs/html/preview/download.jd b/docs/html/preview/download.jd
index 0b115f2..106dab3 100644
--- a/docs/html/preview/download.jd
+++ b/docs/html/preview/download.jd
@@ -184,13 +184,13 @@
 </p>
 
 
-<h2 id="sdk">Developer Preview 3 SDK</h2>
+<h2 id="sdk">Android 6.0 SDK</h2>
 
 <p>
-  The Preview SDK is available for download through the <a href=
+  With Developer Preview 3, the official Android 6.0 SDK is now available for download through the <a href=
   "{@docRoot}tools/help/sdk-manager.html">Android SDK Manager</a>. For more information on
-  downloading and configuring the Preview SDK, see <a href=
-  "{@docRoot}preview/setup-sdk.html#downloadSdk">Set Up the Preview SDK</a>.
+  downloading and configuring the SDK, see <a href=
+  "{@docRoot}preview/setup-sdk.html#downloadSdk">Set Up the SDK</a>.
 </p>
 
 
diff --git a/docs/html/preview/index.jd b/docs/html/preview/index.jd
index 5410e4f..db9a957 100644
--- a/docs/html/preview/index.jd
+++ b/docs/html/preview/index.jd
@@ -18,8 +18,8 @@
       <div class="col-7of16 col-pull-9of16">
         <h1 class="dac-hero-title">Android M Developer Preview</h1>
         <p class="dac-hero-description">
-          <strong>Final SDK is now available!</strong> 
-          Get ready for the next version of Android. Test your apps on Nexus 5, 6, 9, and
+          <strong>The official Android 6.0 SDK is now available!</strong>
+          Get your apps ready for the next version of Android. Test on Nexus 5, 6, 9, and
           Player. Explore what's new &mdash; <strong>runtime permissions</strong>,
           <strong>Doze</strong> and <strong>App Standby</strong> power-saving features, new
           <strong>assist technology</strong>, and more.
diff --git a/docs/html/preview/overview.jd b/docs/html/preview/overview.jd
index 9793592..1e81456 100644
--- a/docs/html/preview/overview.jd
+++ b/docs/html/preview/overview.jd
@@ -160,18 +160,18 @@
   </li>
 
   <li>
-    <strong><a href="{@docRoot}preview/download.html">Preview&nbsp;2</a></strong> (available).
+    <strong><a href="{@docRoot}preview/download_mp2.html">Preview&nbsp;2</a></strong> (available).
   </li>
 
   <li>
-    <strong>Preview&nbsp;3</strong> (final APIs and SDK, now available).
+    <strong><a href="{@docRoot}preview/download.html">Preview&nbsp;3</strong> (final APIs and official Android 6.0 SDK, available).
   </li>
 </ul>
 
 <p>
-  These updates culminate in the <strong>final SDK</strong> (available now),
-  which delivers the official APIs for the new version of Android, as well
-  as the final system behaviors and features.
+  These updates culminate in the <strong>official Android 6.0 SDK</strong> (now available),
+  which lets you build with the final APIs for the new version of Android, as well as
+  near-final system images to let you test system behaviors and features.
 </p>
 
 <p>
@@ -216,7 +216,7 @@
 </p>
 
 <ul>
-  <li>M Developer Preview <strong>SDK tools</strong>
+  <li><strong>Official Android 6.0 SDK and tools</strong>
   </li>
 
   <li>M Developer Preview <strong>emulator system image</strong> (32-bit &amp;
@@ -324,20 +324,20 @@
 
 <p>
    <p>With Developer Preview 3, the platform APIs are now official (API level 23) and the
-   <strong>final SDK is now available</strong>.  We recommend updating your environment
+   <strong>official Android 6.0 SDK is now available</strong>.  We recommend updating your environment
    right away through Android Studio. Once you've updated your environment, you can target
    the new API level, compile against the new platform, and publish at your convenience
    to Google Play (including alpha, beta, or release channels).
 
   <p>If you want to opt out
-  of compatibility behaviors to test your app (which is strongly recommended),
-  you can target the M Developer Preview by setting your app's <code><a href=
+  of compatibility behaviors (which is strongly recommended),
+  you can target the Android 6.0 platform by setting your app's <code><a href=
   "/guide/topics/manifest/uses-sdk-element.html">targetSdkVersion</a></code>
-  to <code>“MNC”</code>.
+  to <code>“23”</code>.
 </p>
 
-  <p>Before releasing your app targeting Android M, we strongly recommend distributing it
-  to a group of testers through the new <a
+  <p>Before releasing your app targeting 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"> 
   beta testing features available in the Google Play Developer Console. See the
   <a href="https://support.google.com/googleplay/android-developer/answer/3131213">Help
diff --git a/docs/html/preview/support.jd b/docs/html/preview/support.jd
index 91c4e1b..a3bfe7e 100644
--- a/docs/html/preview/support.jd
+++ b/docs/html/preview/support.jd
@@ -67,27 +67,27 @@
 </div>
 
 <p>
-  Android M Developer Preview 3 is the <strong>final incremental update</strong>
+  Developer Preview 3 is the <strong>final incremental update</strong>
   to the Android M preview platform that was originally released in May 2015.
-  The update includes <strong>final APIs and final SDK</strong>, as well as
-  <strong>near-final system images</strong> for testing your apps. The
-  updated system images include a variety of fixes and enhancements across
+  The update includes <strong>final APIs and the official Android 6.0 SDK</strong>,
+  as well as <strong>near-final system images</strong> for testing your apps. The
+  updated system images bring a variety of fixes and enhancements across
   the system, including those related to issues reported by developers
   through the external issue tracker.
 </p>
 
 <p>
   If you are currently developing or testing on Android M, you should <strong>update
-  your environment to Developer Preview 3</strong> as soon as possible, so that
-  you can begin <strong>final compatibility testing</strong> in preparation for the public
-  release to device manufacturers.</p>
+  your environment</strong> as soon as possible, so that
+  you can begin <strong>final compatibility testing</strong> in preparation for
+  the public release to device manufacturers later this year.</p>
 
-<p class="important">Updating to Developer Preview 3 ensures that
-   you are building against final platform APIs and testing against
-   the final behaviors. If you are just getting started with the Android
-   M Developer Preview SDK, follow the instructions in <a href=
-  "/preview/setup-sdk.html">Set up the Preview SDK</a>, then update your
-  environment for Developer Preview 3.
+<p class="important">Updating to the Android 6.0 SDK and the latest
+   system images 3 ensures that you are building against final
+   platform APIs in <strong>API level 23</strong> and testing
+   against final behaviors. If you are just getting started,
+   follow the instructions in <a href=
+  "/preview/setup-sdk.html">Set up the Preview SDK</a>.
 </p>
 
 <h3>
@@ -95,15 +95,16 @@
 </h3>
 
 <p>
-  Developer Preview 3 includes an updated SDK and system images,
-  documentation, and samples for developing against the final Android M
+  Developer Preview 3 includes the official Android 6.0 
+  SDK as well as updated preview system images, documentation,
+  and samples for developing against the Android 6.0
   development platform.
 </p>
 
 <ul>
   <li>
     <strong>SDK platform</strong> and <strong>system images</strong> (Nexus and
-    emulator) for building and testing. You can download the updated tools from
+    emulator) for building and testing. You can download the Android 6.0 SDK and tools from
     the SDK Manager, and the system images are available by over-the-air (OTA)
     update or download (see below).
   </li>
@@ -116,14 +117,15 @@
     been updated to reflect the latest changes in the platform. An updated
     <a href="/preview/download.html">Developer Documentation download
     package</a> is available, including full reference docs and API diff
-    reports.
+    reports. Reference documentation is also now <a
+    href="{@docRoot}reference/packages.html">available online</a>.
   </li>
 
   <li>
-    <strong>Translations</strong> of the documentation are now available. Use
+    <strong>Translations</strong> of the documentation are available. Use
     the language selector at the bottom right corner of any page to switch
     languages. Note that some of the translated docs are not yet updated for
-    Developer Preview 3 (coming soon).
+    Developer Preview 3.
   </li>
 
   <li>The <a href="{@docRoot}preview/samples.html">Android M code samples</a> are also
@@ -138,11 +140,7 @@
         <code>shouldShowRequestPermissionRationale()</code>.
       </li>
       <li>
-        <a href=
-        "https://github.com/googlesamples/android-FingerprintDialog">FingerprintDialog</a>
-        adds a flow to ask for passwords when new fingerprints are added as
-        well as a preference if the app will use fingerprints as a method of
-        authentication.
+        Other samples are updated to support runtime permissions.
       </li>
     </ul>
   </li>
@@ -198,8 +196,8 @@
 </h3>
 
 <p>
-  You can download the Developer Preview 3 final SDK platform and
-  emulator images from the SDK Manager.
+  You can download the official Android 6.0 SDK platform and
+  Developer Preview 3 emulator images from the SDK Manager.
 </p>
 
 <p>
@@ -211,23 +209,15 @@
 </p>
 
 <p>
-  If you are just getting started with Android M Developer Preview and want
-  to receive Developer Preview 3 via OTA, download the
-  Developer Preview 2 <a href="{@docRoot}preview/download_mp2.html#images">
-  system image</a>, and flash it to your device. Then,
-  leave the device powered on for several hours. It registers with the
-  OTA service, and receives Developer Preview 3 by OTA.
-</p>
-
-<p>
-  For instructions on how to download and flash your device to the Developer
+  For instructions on how to download and flash your device to the latest Developer
   Preview, see the links and instructions on the <a href=
   "{@docRoot}preview/download.html">Downloads</a> page.
 </p>
 
 <p>
-  For instructions on how to start developing and testing with Android M, read
-  <a href="{@docRoot}preview/setup-sdk.html">Setting up the SDK</a>.
+  For instructions on how to start developing and testing with Android 6.0
+  Marshmallow, read <a href="{@docRoot}preview/setup-sdk.html">Setting
+  up the SDK</a>.
 </p>
 
 <h2 id="preview2-notes">