Merge "Docs: Continuing revisions to Auto Backup doc for Android 6.0 release." into mnc-mr-docs

docs/html/training/backup/autosyncapi.jd

@@ -25,8 +25,9 @@ page.image=images/cards/card-auto-backup_2x.png
 </div>
 
 <p>
-  One of the ways in which Android 6.0 (API level 23) and higher helps ensure a good user experience
-  is by automatically backing up app data to the cloud. The system performs this automatic backup
+  Users frequently invest time and effort to configure apps just the way they like them. Switching
+  to a new device can cancel out all that careful configuration. Devices running Android 6.0 and
+  higher automatically back up app data to the cloud. The system performs this automatic backup
   for nearly all app data by default, and does so without your having to write any additional app
   code.
 </p>

docs/html/training/backup/backupapi.jd

@@ -30,14 +30,20 @@ next.link=gcm.html
 
 <p>When a user purchases a new device or resets their existing one, they might
 expect that when Google Play restores your app back to their device during the
-initial setup, the previous data associated with the app restores as well.  By
-default, that doesn't happen and all the user's accomplishments or settings in
-your app are lost.</p>
+initial setup, the previous data associated with the app restores as well. On versions of Android
+prior to 6.0 (API level 23), app data is not restored by default, and all the user's accomplishments
+or settings in your app are lost.</p>
 <p>For situations where the volume of data is relatively light (less than a
 megabyte), like the user's preferences, notes, game high scores or other
 stats, the Backup API provides a lightweight solution.  This lesson walks you
 through integrating the Backup API into your application, and restoring data to
-new devices using the Backup API.</p>
+new devices using the Backup API.
+
+<p class="note">
+<strong>Note:</strong> Devices running Android 6.0 and higher
+<a href="{@docRoot}training/backup/autosyncapi.html">automatically back up</a>
+nearly all data by default.
+</p>
 
 <h2 id="register">Register for the Android Backup Service</h2>
 <p>This lesson requires the use of the <a

docs/html/training/training_toc.cs

@@ -708,7 +708,7 @@ include the action bar on devices running Android 2.1 or higher."
         </div>
         <ul>
           <li><a href="<?cs var:toroot ?>training/backup/autosyncapi.html">
-            Configuring Auto Backup for Apps
+            Configuring Auto Backup
           </a>
           </li>
           <li><a href="<?cs var:toroot ?>training/backup/backupapi.html">