AI 147732: fix broken links

  BUG=1810005

Automated import of CL 147732

7 files changed, 67 insertions, 36 deletions

diff --git a/core/java/android/appwidget/AppWidgetProvider.java b/core/java/android/appwidget/AppWidgetProvider.java
index f70de9cde67e..7871fb6f65bf 100755
--- a/core/java/android/appwidget/AppWidgetProvider.java
+++ b/core/java/android/appwidget/AppWidgetProvider.java
@@ -30,11 +30,9 @@ import android.os.Bundle;
  *
  * <p>Extend this class and override one or more of the {@link #onUpdate}, {@link #onDeleted},
  * {@link #onEnabled} or {@link #onDisabled} methods to implement your own AppWidget functionality.
- *
- * <h3>Sample Code</h3>
- * For an example of how to write a AppWidget provider, see the
- * <a href="{@toroot}reference/android/appwidget/package-descr.html#providers">android.appwidget
- * package overview</a>.
+ * </p>
+ * <p>For an example of how to write a AppWidget provider, see the
+ * <a href="{@docRoot}guide/topics/appwidgets/index.html#Providers">AppWidgets</a> documentation.</p>
  */
 public class AppWidgetProvider extends BroadcastReceiver {
     /**
diff --git a/docs/html/guide/developing/eclipse-adt.jd b/docs/html/guide/developing/eclipse-adt.jd
index 4f332b13e8cb..75f3d78f4809 100644
--- a/docs/html/guide/developing/eclipse-adt.jd
+++ b/docs/html/guide/developing/eclipse-adt.jd
@@ -188,8 +188,8 @@ id:2
 when launching your application on an emulator.</p>
 
 <p>To learn more about creating and managing AVDs, please read the 
-<a href="{@docRoot}guide/developing/index.html#avd">Developing Overview</a> 
-and <a href="{@docRoot}guide/tools/android.html">android Tool</a> documentation.</p>
+<a href="{@docRoot}guide/developing/tools/avd.html">Android Virtual Devices</a>
+documentation.</p>
 
 
 <h3 id="RunningYourApplication">Running your application</h3>
diff --git a/docs/html/guide/developing/other-ide.jd b/docs/html/guide/developing/other-ide.jd
index 5db4f8d19b22..8cdf0b91d7b8 100644
--- a/docs/html/guide/developing/other-ide.jd
+++ b/docs/html/guide/developing/other-ide.jd
@@ -19,7 +19,7 @@ page.title=Developing In Other IDEs
 
   <h2>See also</h2>
   <ol>
-    <li><a href="{@docRoot}guide/developing/tools/android.html">android Tool</a></li>
+    <li><a href="{@docRoot}guide/developing/tools/othertools.html#android">android Tool</a></li>
     <li><a href="{@docRoot}guide/developing/tools/emulator.html">Android Emulator</a></li>
     <li><a href="{@docRoot}guide/developing/tools/adb.html">Android Debug Bridge</a></li>
   </ol>
@@ -43,7 +43,7 @@ package it for distribution. This document is your guide to using these tools.</
 familiarity with the following Android SDK tools:</p>
 
 <dl>
-  <dt><a href="{@docRoot}guide/developing/tools/android.html">android</a></dt>
+  <dt><a href="{@docRoot}guide/developing/tools/othertools.html#android">android</a></dt>
     <dd>To create/update Android projects and to create/move/delete AVDs.</dd>
   <dt><a href="{@docRoot}guide/developing/tools/emulator.html">Android Emulator</a></dt>
     <dd>To run your Android applications on an emulated Android platform.</dd>
@@ -377,7 +377,7 @@ multiple emulators.</p>
 
 <p>For more information on the tools used above, please see the following documents:</p>
 <ul>
-  <li><a href="{@docRoot}guide/developing/tools/android.html">android Tool</a></li>
+  <li><a href="{@docRoot}guide/developing/tools/othertools.html#android">android Tool</a></li>
   <li><a href="{@docRoot}guide/developing/tools/emulator.html">Android Emulator</a></li>
   <li><a href="{@docRoot}guide/developing/tools/adb.html">Android Debug Bridge</a> (ADB)</li>
 </ul>
diff --git a/docs/html/sdk/1.0_r1/requirements.jd b/docs/html/sdk/1.0_r1/requirements.jd
new file mode 100644
index 000000000000..af0667548dcc
--- /dev/null
+++ b/docs/html/sdk/1.0_r1/requirements.jd
@@ -0,0 +1,45 @@
+page.title=System Requirements
+sdk.version=1.0_r1
+
+
+@jd:body
+
+<p>The sections below describe the system and software requirements for 
+developing Android applications using the Android SDK tools included in Android 1.0 SDK, Release 1. </p>
+
+<h2>System and Software Requirements</h2>
+<p>The following systems and development environments are supported by this SDK.</p>
+
+<h4>Supported Operating Systems:</h4>
+<ul>
+  <li>Windows XP or Vista</li>
+  <li>Mac OS X 10.4.8 or later (x86 only)</li>
+  <li>Linux (tested on Linux Ubuntu Dapper Drake)</li>
+</ul>
+
+<h4>Supported Development Environments:</h4>
+<ul>
+  <li>Eclipse IDE
+    <ul>
+      <li><a href="http://www.eclipse.org/downloads/">Eclipse</a> 3.3 (Europa), 3.4 (Ganymede)
+        <ul>
+        <li>Eclipse <a href="http://www.eclipse.org/jdt">JDT</a> plugin (included in most Eclipse IDE packages) </li>
+        <li><a href="http://www.eclipse.org/webtools">WST</a> (optional, but needed for the Android Editors feature; included in <a href="http://www.eclipse.org/downloads/moreinfo/compare.php">most Eclipse IDE packages</a>)</li>
+        </ul>
+      </li>     
+      <li><a href="http://java.sun.com/javase/downloads/index.jsp">JDK 5 or JDK 6</a> (JRE alone is not sufficient)</li>
+      <li><a href="installing.html#installingplugin">Android Development Tools plugin</a> (optional)</li>
+      <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
+    </ul>
+  </li>
+  <li>Other development environments or IDEs
+    <ul>
+      <li><a href="http://java.sun.com/javase/downloads/index.jsp">JDK 5 or JDK 6</a> (JRE alone is not sufficient)</li>
+      <li><a href="http://ant.apache.org/">Apache Ant</a> 1.6.5 or later for Linux and Mac, 1.7 or later for Windows</li>
+      <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
+    </ul>
+  </li>
+</ul>
+
+<p class="note"><strong>Note:</strong> If JDK is already installed on your development computer, please take a moment to make sure that it meets the version requirements listed above. In
+particular, note that some Linux distributions may include JDK 1.4 or Gnu Compiler for Java, both of which are not supported for Android development. </p>
\ No newline at end of file
diff --git a/docs/html/sdk/1.1_r1/installing.jd b/docs/html/sdk/1.1_r1/installing.jd
index d5a710648363..2da24799f95b 100644
--- a/docs/html/sdk/1.1_r1/installing.jd
+++ b/docs/html/sdk/1.1_r1/installing.jd
@@ -242,7 +242,7 @@ href="{@docRoot}reference/index.html">Reference</a> tab</li>
 <p><strong>Explore the SDK</strong></p>
 <ul>
 <li>Get an overview of the <a
-href="{@docRoot}guide/development/tools/index.html">development
+href="{@docRoot}guide/developing/tools/index.html">development
 tools</a> that are available to you</li>
 <li>Read the overviews of how to develop <a
 href="{@docRoot}guide/developing/eclipse-adt.html">in Eclipse/ADT</a> or
diff --git a/docs/html/sdk/1.5_r1/installing.jd b/docs/html/sdk/1.5_r1/installing.jd
index bd366ff1add9..c388b846a15c 100644
--- a/docs/html/sdk/1.5_r1/installing.jd
+++ b/docs/html/sdk/1.5_r1/installing.jd
@@ -250,13 +250,13 @@ begin developing applications. Here are a few ways you can get started: </p>
   <a href="{@docRoot}guide/topics/fundamentals.html">Application
   Fundamentals</a></li>
   <li>Take a look at the Android framework API specification in the <a
-  href="{@docRoot}reference/index.html">Reference</a> tab</li>
+  href="{@docRoot}reference/packages.html">Reference</a> tab</li>
 </ul>
 
 <p><strong>Explore the SDK</strong></p>
 <ul>
   <li>Get an overview of the <a
-  href="{@docRoot}guide/developming/tools/index.html">development
+  href="{@docRoot}guide/developing/tools/index.html">development
   tools</a> that are available to you</li>
   <li>Read how to develop <a
   href="{@docRoot}guide/developing/eclipse-adt.html">in Eclipse/ADT</a> or
diff --git a/docs/html/sdk/RELEASENOTES.jd b/docs/html/sdk/RELEASENOTES.jd
index c6a887a44662..ed82b6bc6064 100644
--- a/docs/html/sdk/RELEASENOTES.jd
+++ b/docs/html/sdk/RELEASENOTES.jd
@@ -355,12 +355,12 @@ added.</p>
 Development Tools (ADT) Plugin for Eclipse is <strong>0.8.0</strong>. If you are
 using a previous version of ADT, you should update to the latest version for use
 with this SDK. For information about how to update your ADT plugin, see <a
-href="/android/intro/upgrading.html">Upgrading the SDK</a>.</p>
+href="{@docRoot}sdk/1.0_r2/upgrading.html">Upgrading the SDK</a>.</p>
 
 <h3>Installation and Upgrade Notes</h3>
 
 <p>If you're installing the Android SDK for the first time, please see the
-instructions in <a href="/android/intro/installing.html">Installing the
+instructions in <a href="{@docRoot}sdk/1.0_r2/installing.html">Installing the
 SDK</a>.
 
 <h3>Other Notes</h3>
@@ -381,8 +381,8 @@ MapView for authentication to the server.</p>
 <p>Developers should note that the registration service for MapView is now
 active and Google Maps is actively enforcing the Maps API Key requirement. For
 information about how to register for a Maps API Key, see <a
-href="http://code.google.com/android/toolbox/apis/mapkey.html">http://code.
-google.com/android/toolbox/apis/mapkey.html</a>.</p>
+href="http://code.google.com/android/add-ons/google-apis/mapkey.html">http://code.google.com/android/add-ons/google-apis/mapkey.html</a>.
+</p>
 
 <p><strong>USB Driver for Windows</strong></p>
 <p>If you using Windows and want to develop or test your application on an
@@ -407,7 +407,7 @@ do so, declare a custom resource element using a
 file, then declare the attribute inside. For examples, see 
 &lt;sdk&gt;/samples/ApiDemos/res/values/attrs.xml. For more information about
 custom resources, see <a
-href="/android/reference/available-resources.html#customresources">Custom
+href="{@docRoot}guide/topics/resources/available-resources.html#customresources">Custom
 Layout Resources</a>. Note that the android.R.styleable documentation is still
 provided in the SDK, but only as a reference of the platform's styleable
 attributes for the various elements.</li>
@@ -437,27 +437,27 @@ to this release.</p>
 
 <p>This SDK release is the first to include the Android 1.0 platform and application API. Applications developed on this SDK will be compatible with mobile devices running the Android 1.0 platform, when such devices are available.</p>
 
-<p>This release includes mainly bug fixes, although some smaller features were added. The Android 1.0 also includes several API changes from the 0.9 version. For more information on API changes, see the <a href="/android/migrating/0.9-1.0/changes-overview.html">Overview of Changes</a> and the <a href="/android/migrating/0.9-1.0/changes.html">API Differences Report</a>. For those porting from the M5 release, the SDK also includes the legacy changes overview and API Differences Reports. See the current Overview of Changes for more information. </p>
+<p>This release includes mainly bug fixes, although some smaller features were added. The Android 1.0 also includes several API changes from the 0.9 version. For those porting from the M5 release, the SDK also includes the legacy changes overview and API Differences Reports. See the current Overview of Changes for more information. </p>
 
 <h3>ADT Plugin Compatibility</h3>
 
-<p>For this version of the SDK &mdash; Android 1.0 SDK, Release 1 &mdash; the compatible version of the Android Development Tools (ADT) Plugin for Eclipse is <strong>0.8.0</strong>. If you are using a previous version of ADT, you should update to the latest version for use with this SDK. For information about how to update your ADT plugin, see <a href="/android/intro/upgrading.html">Upgrading the SDK</a>.</p>
+<p>For this version of the SDK &mdash; Android 1.0 SDK, Release 1 &mdash; the compatible version of the Android Development Tools (ADT) Plugin for Eclipse is <strong>0.8.0</strong>. If you are using a previous version of ADT, you should update to the latest version for use with this SDK. For information about how to update your ADT plugin, see <a href="{@docRoot}sdk/1.0_r1/upgrading.html">Upgrading the SDK</a>.</p>
 
 <h3>Installation and Upgrade Notes</h3>
 
-<p>If you've been developing an application using a previous SDK version and you want the application to run on Android-powered mobile devices, you must port the application to the Android 1.0 SDK. Please see <a href="/android/intro/upgrading.html">Upgrading the SDK</a> for detailed instructions on how to make the transition to this release.  Be sure to wipe application user data (emulator option <code>-wipe-data</code>) when running your application on the Android 1.0 SDK emulator.</p>
+<p>If you've been developing an application using a previous SDK version and you want the application to run on Android-powered mobile devices, you must port the application to the Android 1.0 SDK. Please see <a href="{@docRoot}sdk/1.0_r1/upgrading.html">Upgrading the SDK</a> for detailed instructions on how to make the transition to this release.  Be sure to wipe application user data (emulator option <code>-wipe-data</code>) when running your application on the Android 1.0 SDK emulator.</p>
 
-<p>If you're installing the Android SDK for the first time, please see the instructions in <a href="/android/intro/installing.html">Installing the SDK</a>.
+<p>If you're installing the Android SDK for the first time, please see the instructions in <a href="{@docRoot}sdk/1.0_r1/installing.html">Installing the SDK</a>.
 
 <h3>Other Notes</h3>
 
 <p><strong>MapView API Key</strong></p>
 
-<p><a href="/android/reference/com/google/android/maps/MapView.html">MapView</a> is a class that lets you easily integrate Google Maps into your application. Before you can access the maps data, you will need to register with the Google Maps service and receive a Maps API Key, which you then add to your MapView for authentication to the server.</p>
+<p>MapView is a class that lets you easily integrate Google Maps into your application. Before you can access the maps data, you will need to register with the Google Maps service and receive a Maps API Key, which you then add to your MapView for authentication to the server.</p>
 
 <p>Currently, the registration service for MapView is not yet active and Google Maps is not yet enforcing the Maps API Key requirement. However, note that the registration service will be activated soon, so that MapViews in any application deployed to a mobile device will require registration and a valid Maps API Key. </p>
 
-<p>As soon as the registration service becomes available, we will update the page at <a href="http://code.google.com/android/toolbox/apis/mapkey.html">http://code.google.com/android/toolbox/apis/mapkey.html</a> with details about how and where to register. Please check that page periodically for registration information, if you are using a MapView.</p>
+<p>As soon as the registration service becomes available, we will update the page at <a href="http://code.google.com/android/add-ons/google-apis/mapkey.html">http://code.google.com/android/add-ons/google-apis/mapkey.html</a> with details about how and where to register. Please check that page periodically for registration information, if you are using a MapView.</p>
 
 
 <h3>Resolved Issues, Changes</h3>
@@ -485,18 +485,6 @@ to this release.</p>
 <li>SQLite is now included in the SDK package on all platforms. </li>
 </ul>
 
-<h3>Known Issues</h3>
-
-<p><strong>JUnit and Eclipse/ADT</strong></p>
-<ul>
-<li>If you are developing in Eclipse/ADT and want to add JUnit test
-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="/android/kb/troubleshooting.html#addjunit">Running a Junit test class
-in Eclipse</a>.</li>
-</ul>
-
 <p><strong>Other</strong></p>
 
 <ul>