AI 143696: am: CL 143576 SDK doc change: Fix links from SDK upgrading docs to migration and diff info.

  Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 143696

4 files changed, 29 insertions, 16 deletions

diff --git a/docs/html/sdk/1.0_r1/upgrading.jd b/docs/html/sdk/1.0_r1/upgrading.jd
index 480bff3..d6d5dc4 100644
--- a/docs/html/sdk/1.0_r1/upgrading.jd
+++ b/docs/html/sdk/1.0_r1/upgrading.jd
@@ -133,11 +133,17 @@ to place 3rd jar files, which are now automatically handled by the Ant script.</
 
 <h2 id="migrate">Migrate your applications</h2>
 
-<p>After updating your SDK, you will likely encounter breakages in your code, due to 
-framework and API changes. You'll need to update your code to match changes in the Android APIs.</p>
+<p>If (and only if) you have written apps in an SDK released previous to
+the Android 1.0 SDK, you will need to migrate your applications. After
+updating your SDK, you may encounter breakages in your code, due to
+framework and API changes. You'll need to update your code to match
+changes in the Android APIs.</p>
 
 <p>One way to start is to open your project in Eclipse and see where the ADT
-identifies errors in your application.</p>
+identifies errors in your application. You can also look up
+specific changes in the Android APIs in the <em>Overview of Changes</em> and <em>
+API Diffs Report</em>, both available in the documentation included with the
+Android 1.0 SDK package.</p>
 
 <p>If you have additional trouble updating your code, visit the 
 <a href="http://groups.google.com/group/android-developers">Android Developers Group</a>
diff --git a/docs/html/sdk/1.0_r2/upgrading.jd b/docs/html/sdk/1.0_r2/upgrading.jd
index df9b657..409e30e 100644
--- a/docs/html/sdk/1.0_r2/upgrading.jd
+++ b/docs/html/sdk/1.0_r2/upgrading.jd
@@ -133,11 +133,17 @@ to place 3rd jar files, which are now automatically handled by the Ant script.</
 
 <h2 id="migrate">Migrate your applications</h2>
 
-<p>After updating your SDK, you will likely encounter breakages in your code, due to 
-framework and API changes. You'll need to update your code to match changes in the Android APIs.</p>
+<p>If (and only if) you have written apps in an SDK released previous to
+the Android 1.0 SDK, you will need to migrate your applications. After
+updating your SDK, you may encounter breakages in your code, due to
+framework and API changes. You'll need to update your code to match
+changes in the Android APIs.</p>
 
 <p>One way to start is to open your project in Eclipse and see where the ADT
-identifies errors in your application.</p>
+identifies errors in your application. You can also look up
+specific changes in the Android APIs in the <em>Overview of Changes</em> and <em>
+API Diffs Report</em>, both available in the documentation included with the
+Android 1.0 SDK package.</p>
 
 <p>If you have additional trouble updating your code, visit the 
 <a href="http://groups.google.com/group/android-developers">Android Developers Group</a>
diff --git a/docs/html/sdk/1.1_r1/upgrading.jd b/docs/html/sdk/1.1_r1/upgrading.jd
index 2ad6757..19095c0 100644
--- a/docs/html/sdk/1.1_r1/upgrading.jd
+++ b/docs/html/sdk/1.1_r1/upgrading.jd
@@ -131,11 +131,11 @@ framework and API changes. You'll need to update your code to match the
 latest APIs.</p>
 
 <p>One way to start is to open your project in Eclipse and see where the ADT
-identifies errors in your application. From there, you can lookup
-specific API changes in the Android 1.0 APIs in the 
-<a href="http://code.google.com/android/migrating/changes-overview.html">
-Overview of Changes</a> and <a href="http://code.google.com/android/migrating/changes.html">
-API Diffs Report</a>.</p>
+identifies errors in your application. You can also look up
+specific changes in the Android APIs in the 
+<a href="{@docRoot}sdk/android-1.1.html#api-changes">Android 1.1 Version 
+Notes</a> document.</p>
+
 
 <p>If you have additional trouble updating your code, visit the 
 <a href="http://groups.google.com/group/android-developers">Android Developers Group</a>
diff --git a/docs/html/sdk/1.5_r1/upgrading.jd b/docs/html/sdk/1.5_r1/upgrading.jd
index 23cb82c..63b7a3c 100644
--- a/docs/html/sdk/1.5_r1/upgrading.jd
+++ b/docs/html/sdk/1.5_r1/upgrading.jd
@@ -131,11 +131,12 @@ framework and API changes. You'll need to update your code to match the
 latest APIs.</p>
 
 <p>One way to start is to open your project in Eclipse and see where the ADT
-identifies errors in your application. From there, you can lookup
-specific API changes in the Android 1.0 APIs in the 
-<a href="http://code.google.com/android/migrating/changes-overview.html">
-Overview of Changes</a> and <a href="http://code.google.com/android/migrating/changes.html">
-API Diffs Report</a>.</p>
+identifies errors in your application. You can also look up
+specific changes in the Android APIs in the 
+<!-- <a href="{@docRoot}sdk/android-1.5.html#api-changes"> -->
+Android 1.5 Version Notes
+<!-- </a> -->
+document.</p>
 
 <p>If you have additional trouble updating your code, visit the 
 <a href="http://groups.google.com/group/android-developers">Android Developers Group</a>