14 files changed, 14 insertions, 14 deletions
diff --git a/core/java/android/animation/package.html b/core/java/android/animation/package.html
index 59178f7..47bac25 100644
--- a/core/java/android/animation/package.html
+++ b/core/java/android/animation/package.html
@@ -8,7 +8,7 @@ to calculate the values for that given type with a custom {@link android.animati
 </p>
 
 <p>For more information, see the
-<a href="{@docRoot}guide/topics/graphics/animation.html">Animation</a> developer guide.</p>
+<a href="{@docRoot}guide/topics/graphics/prop-animation.html">Animation</a> guide.</p>
 {@more}
 
 <p>
diff --git a/core/java/android/app/admin/package.html b/core/java/android/app/admin/package.html
index c363c25..ca10979 100644
--- a/core/java/android/app/admin/package.html
+++ b/core/java/android/app/admin/package.html
@@ -6,7 +6,7 @@ require rich control over employee devices.</p>
 
 <p>For more information, see the
 <a href="{@docRoot}guide/topics/admin/device-admin.html">Device Administration</a> 
-developer guide.</p>
+guide.</p>
 {@more}
 
 </BODY>
diff --git a/core/java/android/app/backup/package.html b/core/java/android/app/backup/package.html
index 56658f5..8b5e3ba 100644
--- a/core/java/android/app/backup/package.html
+++ b/core/java/android/app/backup/package.html
@@ -6,7 +6,7 @@ device, all applications that have enabled backup can restore the user's previou
 application is reinstalled.</p>
 
 <p>For more information, see the <a
-href="{@docRoot}guide/topics/data/backup.html">Data Backup</a> developer guide.</p>
+href="{@docRoot}guide/topics/data/backup.html">Data Backup</a> guide.</p>
 {@more}
 
 <p>All backup and restore operations are controlled by the {@link
diff --git a/core/java/android/appwidget/package.html b/core/java/android/appwidget/package.html
index aa72da2..d4c0db0 100644
--- a/core/java/android/appwidget/package.html
+++ b/core/java/android/appwidget/package.html
@@ -4,7 +4,7 @@ applications (such as the home screen) to quickly access application data and se
 launching a new activity.</p>
 
 <p>For more information, see the
-<a href="{@docRoot}guide/topics/appwidgets/index.html">App Widgets</a> developer guide.</p>
+<a href="{@docRoot}guide/topics/appwidgets/index.html">App Widgets</a> guide.</p>
 {@more}
 
 <p>The behavior of an app widget is published by an "app widget provider."  An "app widget host" is
diff --git a/core/java/android/bluetooth/package.html b/core/java/android/bluetooth/package.html
index 81bf1cf..ba75034 100644
--- a/core/java/android/bluetooth/package.html
+++ b/core/java/android/bluetooth/package.html
@@ -4,7 +4,7 @@
 devices, connecting with devices, and managing data transfer between devices.</p>
 
 <p>For more information, see the
-<a href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p>
+<a href="{@docRoot}guide/topics/connectivity/bluetooth.html">Bluetooth</a> guide.</p>
 {@more}
 
 <p>The Bluetooth APIs let applications:</p>
diff --git a/core/java/android/content/res/package.html b/core/java/android/content/res/package.html
index 0af94a4..3d0bac1 100644
--- a/core/java/android/content/res/package.html
+++ b/core/java/android/content/res/package.html
@@ -6,7 +6,7 @@ in the package, plus important device configuration details
 (orientation, input types, etc.) that affect how the application may behave.</p>
 
 <p>For more information, see the <a
-href="{@docRoot}guide/topics/resources/index.html">Application Resources</a> developer guide.</p>
+href="{@docRoot}guide/topics/resources/index.html">Application Resources</a> guide.</p>
 {@more}
 </BODY>
 </HTML>
 \ No newline at end of file
diff --git a/core/java/android/hardware/usb/package.html b/core/java/android/hardware/usb/package.html
index b32e0df..4065de3 100644
--- a/core/java/android/hardware/usb/package.html
+++ b/core/java/android/hardware/usb/package.html
@@ -4,7 +4,7 @@
 Android-powered devices.</p>
 
 <p>For more information, see the
-<a href="{@docRoot}guide/topics/usb/index.html">USB</a> developer guide.</p>
+<a href="{@docRoot}guide/topics/connectivity/usb/index.html">USB</a> guide.</p>
 {@more}
 
 <p>Use {@link android.hardware.usb.UsbManager} to access the state of the USB and to
diff --git a/core/java/android/nfc/package.html b/core/java/android/nfc/package.html
index 9e028a5..55c1d16 100644
--- a/core/java/android/nfc/package.html
+++ b/core/java/android/nfc/package.html
@@ -4,7 +4,7 @@
 NDEF message in NFC tags. A "tag" may actually be another device that appears as a tag.</p>
 
 <p>For more information, see the
-<a href="{@docRoot}guide/topics/nfc/index.html">Near Field Communication</a> developer guide.</p>
+<a href="{@docRoot}guide/topics/connectivity/nfc/index.html">Near Field Communication</a> guide.</p>
 {@more}
 
 <p>Here's a summary of the classes:</p>
diff --git a/core/java/android/test/package.html b/core/java/android/test/package.html
index 770e9a5..5be5135 100644
--- a/core/java/android/test/package.html
+++ b/core/java/android/test/package.html
@@ -3,7 +3,7 @@
 <p>A framework for writing Android test cases and suites.</p>
 
 <p>For more information, see the
-<a href="{@docRoot}guide/topics/testing/index.html">Testing</a> developer guide.</p>
+<a href="{@docRoot}tools/testing/index.html">Testing</a> developer guide.</p>
 {@more}
 
 </BODY>
diff --git a/core/java/overview.html b/core/java/overview.html
index b3af0e0..e8fcc0e 100644
--- a/core/java/overview.html
+++ b/core/java/overview.html
@@ -1,3 +1,3 @@
 <body>
-    These are the Android APIs.
+    These are the Android APIs. See all <a href="classes.html">API classes</a>.
 </body>
diff --git a/docs/html/legal.jd b/docs/html/legal.jd
index 575f016..3c614d3 100644
--- a/docs/html/legal.jd
+++ b/docs/html/legal.jd
@@ -40,7 +40,7 @@ href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution<
 use of it must be attributed as such.</p>
 
 <p>For more information about Android brands, see the <a
-href="http://www.android.com/developers/branding.html">Android Branding Guidelines</a>.</p>
+href="{@docRoot}distribute/googleplay/promote/brand.html">Android Branding Guidelines</a>.</p>
 
 
 
diff --git a/location/java/android/location/package.html b/location/java/android/location/package.html
index 1abe098..2732efc 100644
--- a/location/java/android/location/package.html
+++ b/location/java/android/location/package.html
@@ -4,7 +4,7 @@
 <p>Contains classes that define Android location-based and related services.</p>
 
 <p>For more information, see the
-<a href="{@docRoot}guide/topics/location/index.html">Location and Maps</a> developer guide.</p>
+<a href="{@docRoot}guide/topics/location/index.html">Location and Maps</a> guide.</p>
 {@more}
 
 </body>
diff --git a/test-runner/src/android/test/mock/package.html b/test-runner/src/android/test/mock/package.html
index 29b2d80..c0fcd1e 100644
--- a/test-runner/src/android/test/mock/package.html
+++ b/test-runner/src/android/test/mock/package.html
@@ -3,7 +3,7 @@
 <p>Utility classes providing stubs or mocks of various Android framework building blocks.</p>
 
 <p>For more information, see the
-<a href="{@docRoot}guide/topics/testing/index.html">Testing</a> developer guide.</p>
+<a href="{@docRoot}tools/testing/index.html">Testing</a> guide.</p>
 {@more}
 
 </BODY>
diff --git a/voip/java/android/net/sip/package.html b/voip/java/android/net/sip/package.html
index eb683d0..3c4cc23 100644
--- a/voip/java/android/net/sip/package.html
+++ b/voip/java/android/net/sip/package.html
@@ -4,7 +4,7 @@
 making and answering VOIP calls using SIP.</p>
 
 <p>For more information, see the
-<a href="{@docRoot}guide/topics/network/sip.html">Session Initiation Protocol</a>
+<a href="{@docRoot}guide/topics/connectivity/sip.html">Session Initiation Protocol</a>
 developer guide.</p>
 {@more}