sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.

Bug: 2160782
Change-Id: Ib1eb2e9e3fe3a7b2ad16387dbf888646a1195221

6 files changed, 20 insertions, 15 deletions

diff --git a/docs/html/sdk/1.1_r1/upgrading.jd b/docs/html/sdk/1.1_r1/upgrading.jd
index 19095c0..5628d04 100644
--- a/docs/html/sdk/1.1_r1/upgrading.jd
+++ b/docs/html/sdk/1.1_r1/upgrading.jd
@@ -145,6 +145,6 @@ to seek help from other Android developers.</p>
 to the new SDK, note that you will need to uninstall the version of ApiDemos that comes 
 preinstalled in the emulator. For more information, or if you encounter an "reinstallation" 
 error when running or installing ApiDemos, see the troubleshooting topic 
-<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#apidemosreinstall">I can't install ApiDemos 
+<a href="{@docRoot}resources/faq/troubleshooting.html#apidemosreinstall">I can't install ApiDemos 
 apps in my IDE because of a signing error</a> for information about how to solve the problem.</p>
 
diff --git a/docs/html/sdk/RELEASENOTES.jd b/docs/html/sdk/RELEASENOTES.jd
index fdaba61..2c1d495 100644
--- a/docs/html/sdk/RELEASENOTES.jd
+++ b/docs/html/sdk/RELEASENOTES.jd
@@ -604,7 +604,7 @@ Device for Development</a>.</p>
 classes, you can do so. However, you need to set up a custom JUnit configuration
 before your tests will run properly. For detailed information about how to set
 up the JUnit configuration, see the troubleshooting topic <a
-href="{@docRoot}guide/appendix/faq/troubleshooting.html#addjunit">Running a Junit test class
+href="{@docRoot}resources/faq/troubleshooting.html#addjunit">Running a Junit test class
 in Eclipse</a>.</li>
 </ul>
 
diff --git a/docs/html/sdk/android-2.0.1.jd b/docs/html/sdk/android-2.0.1.jd
index fbce45e..43b1710 100644
--- a/docs/html/sdk/android-2.0.1.jd
+++ b/docs/html/sdk/android-2.0.1.jd
@@ -297,9 +297,8 @@ package name, rather than the process name.</li>
 <p>For a detailed view of API changes in Android {@sdkPlatformVersion} (API Level {@sdkPlatformApiLevel}), as compared to 
 API Level 5, see the <a
 href="{@docRoot}sdk/api_diff/{@sdkPlatformApiLevel}/changes.html">API
-Differences Report</a>. Note that this difference report compares only to
-the most recent API Level, and there are few changes, so to see changes
-introduces in Android 2.0 (API Level 5), see the <a
+Differences Report</a>. There are very few API changes in API Level 6, 
+so you might also be interested in reviewing the <a
 href="{@docRoot}sdk/api_diff/5/changes.html">API
-Differences between 4 and 5</a>.</p>
+differences between 4 and 5</a>.</p>
 
diff --git a/docs/html/sdk/eclipse-adt.jd b/docs/html/sdk/eclipse-adt.jd
index 7d9efdb..f861afd 100644
--- a/docs/html/sdk/eclipse-adt.jd
+++ b/docs/html/sdk/eclipse-adt.jd
@@ -53,6 +53,11 @@ Android &mdash; make sure that you have a suitable version of Eclipse
 installed on your computer (3.4 or newer is recommended). If you need 
 to install Eclipse, you can download it from this location: </p>
 
+<p style="margin-left:2em;"><a href=
+"http://www.eclipse.org/downloads/">http://www.eclipse.org/downloads/</a>
+</p>
+
+<p>A Java or RCP version of Eclipse is recommended. </p>
 
 <h2 id="installing">Installing the ADT Plugin</h2>
 
@@ -196,7 +201,7 @@ Eclipse components (for example, WST). If you encounter an error when
 installing ADT, your Eclipse installion might not include these components. 
 For information about how to quickly add the necessary components to your 
 Eclipse installation, see the troubleshooting topic 
-<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#installeclipsecomponents">ADT 
+<a href="{@docRoot}resources/faq/troubleshooting.html#installeclipsecomponents">ADT 
 Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p>
 
 <h4>For Linux users</h4>
@@ -263,9 +268,10 @@ href="{@docRoot}sdk/adt-notes.html">ADT Plugin Notes</a> document. </p>
 
 <p>If you encounter problems during the update of ADT, you 
 can try removing the existing ADT plugin and then performing a fresh
-installation. Fully remove your existing ADT Plugin as described in <a
-href="#uninstalling">Uninstalling the ADT Plugin</a>, below, and then follow the guide to <a
-href="#installing">Installing the ADT Plugin</a>.</p>
+installation. To remove the plugin, follow the instructions in <a
+href="#uninstalling">Uninstalling the ADT Plugin</a>, below. To reinstall 
+the plugin, follow the instructions in <a
+href="#installing">Installing the ADT Plugin</a>, above.</p>
 
 
 <h2 id="uninstalling">Uninstalling the ADT plugin</h2>
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index 6ca02b6..209a67b 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -84,6 +84,6 @@ Google Maps external library. </p>
 project or move existing applications into the new SDK.</p>
 
 <p>If you are new to Android, you can use the <a
-href="{@docRoot}guide/tutorials/hello-world.html">Hello World</a> tutorial to
+href="{@docRoot}resources/tutorials/hello-world.html">Hello World</a> tutorial to
 get started quickly. <a href="{@docRoot}sdk/installing.html#NextSteps">Next
 Steps</a> offers other suggestions of how to begin. Welcome!</p>
diff --git a/docs/html/sdk/installing.jd b/docs/html/sdk/installing.jd
index 261b49f..698c347 100644
--- a/docs/html/sdk/installing.jd
+++ b/docs/html/sdk/installing.jd
@@ -186,7 +186,7 @@ multiversion documentation for the Android framework API.
 </ul>
 
 <p>To develop <em>any</em> Android application, even if you are following the <a
-href="{@docRoot}guide/tutorials/hello-world.html">Hello World</a> tutorial, you
+href="{@docRoot}resources/tutorials/hello-world.html">Hello World</a> tutorial, you
 <strong>must download at least one Android platform</strong> into your SDK.
 Typically, you will want to download multiple platforms, so that you can build
 your application on the lowest version you want to support, but test against
@@ -342,9 +342,9 @@ begin developing applications. Here are a few ways you can get started: </p>
 
 <p><strong>Explore some code</strong></p>
 <ul>
-  <li>Set up a <a href="{@docRoot}guide/tutorials/hello-world.html">Hello
+  <li>Set up a <a href="{@docRoot}resources/tutorials/hello-world.html">Hello
   World application</a> (highly recommended, especially for Eclipse users)</li>
-  <li>Follow the <a href="{@docRoot}guide/tutorials/notepad/index.html">
+  <li>Follow the <a href="{@docRoot}resources/tutorials/notepad/index.html">
   Notepad Tutorial</a> to build a full Android application </li>
   <li>Create a new project for one of the other sample applications
   included in <code><em>&lt;sdk&gt;</em>/platforms/<em>&lt;platform&gt;</em>/samples</code>, 
@@ -354,7 +354,7 @@ begin developing applications. Here are a few ways you can get started: </p>
 <p><strong>Visit the Android developer groups</strong></p>
 <ul>
   <li>Take a look at the <a
-  href="{@docRoot}community/index.html">Community</a> tab to see a list of
+  href="{@docRoot}resources/community-groups.html">Community</a> pages to see a list of
   Android developers groups. In particular, you might want to look at the
   <a href="http://groups.google.com/group/android-developers">Android
   Developers</a> group to get a sense for what the Android developer