am a925b6a6: am 93d204ed: cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882

* commit 'a925b6a64c8137804547d5cfcd97415392d667b1':
  cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882

6 files changed, 13 insertions, 10 deletions

diff --git a/docs/html/guide/topics/admin/device-admin.jd b/docs/html/guide/topics/admin/device-admin.jd
index fda716a..b86a5f0 100644
--- a/docs/html/guide/topics/admin/device-admin.jd
+++ b/docs/html/guide/topics/admin/device-admin.jd
@@ -156,14 +156,14 @@ Administration API lets you do the following:</p> <ul>
 <h2 id="sample">Sample Application</h2>
 
 <p>The examples used in this document are based on the <a
-href="{@docRoot}resources/samples/ApiDemos/src/com/example/
-android/apis/app/DeviceAdminSample.html">Device Administration API
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.html">
+Device Administration API
 sample</a>, which is included in the SDK samples. For information on downloading and
 installing the SDK samples, see <a
 href="{@docRoot}resources/samples/get.html">
 Getting the Samples</a>. Here is the  <a
-href="{@docRoot}resources/samples/ApiDemos/src/com/example/
-android/apis/app/DeviceAdminSample.html">complete code</a> for
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.html">
+complete code</a> for
 the sample. </p>
 <p>The
 sample application offers a demo of device admin features. It presents users
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd
index 2e43c30..a2a4001 100644
--- a/docs/html/guide/topics/manifest/uses-feature-element.jd
+++ b/docs/html/guide/topics/manifest/uses-feature-element.jd
@@ -339,7 +339,7 @@ the feature as shown below.</p>
 <p class="caution">It's important to understand that the permissions that you
 request in <code>&lt;uses-permission&gt;</code> elements can directly affect how
 Android Market filters your application. The reference section <a
-href="permissions-features">Permissions that Imply Feature Requirements</a>,
+href="#permissions-features">Permissions that Imply Feature Requirements</a>,
 below, lists the full set of permissions that imply feature requirements and
 therefore trigger filtering.</p>
 
diff --git a/docs/html/guide/topics/resources/layout-resource.jd b/docs/html/guide/topics/resources/layout-resource.jd
index 36369d3..b069521 100644
--- a/docs/html/guide/topics/resources/layout-resource.jd
+++ b/docs/html/guide/topics/resources/layout-resource.jd
@@ -181,7 +181,7 @@ that already contains the appropriate parent View to contain the children of the
 in another layout file using <a href="#include-element"><code>&lt;include&gt;</code></a> and
 this layout doesn't require a different {@link android.view.ViewGroup} container. For more
 information about merging layouts, read <a
-href="{@docRoot}resources/articles/layout-tricks-merging.html">Layout
+href="{@docRoot}resources/articles/layout-tricks-merge.html">Layout
 Tricks: Merging</a>.</dd>
 
   </dl>
diff --git a/docs/html/guide/topics/testing/contentprovider_testing.jd b/docs/html/guide/topics/testing/contentprovider_testing.jd
index 279e347..e42e631 100644
--- a/docs/html/guide/topics/testing/contentprovider_testing.jd
+++ b/docs/html/guide/topics/testing/contentprovider_testing.jd
@@ -37,7 +37,7 @@ page.title=Content Provider Testing
       <ol>
         <li>
           <a
-          href="{@docRoot}guide/topics/testing/topics/testing_android.html">
+          href="{@docRoot}guide/topics/testing/testing_android.html">
           Testing Fundamentals</a>
         </li>
         <li>
@@ -123,7 +123,8 @@ page.title=Content Provider Testing
     The constructor then creates a {@link android.test.mock.MockContentResolver} to use as the
     resolver for the test. The {@link android.test.mock.MockContentResolver} class is described in
     detail in the section
-    <a href="{@docRoot}guide/topics/testing/test_android#MockObjectClasses">Mock object classes</a>.
+    <a href="{@docRoot}guide/topics/testing/testing_android.html#MockObjectClasses">Mock object
+classes</a>.
 </p>
 <p>
     Lastly, the constructor creates an instance of the provider under test. This is a normal
@@ -137,7 +138,7 @@ page.title=Content Provider Testing
     {@link android.test.ProviderTestCase2} uses {@link android.test.IsolatedContext} and
     {@link android.test.mock.MockContentResolver}, which are standard mock object classes. To
     learn more about them, please read
-    <a href="{@docRoot}guide/topics/testing/test_android#MockObjectClasses">
+    <a href="{@docRoot}guide/topics/testing/testing_android.html#MockObjectClasses">
     Testing Fundamentals</a>.
 </p>
 <h2 id="WhatToTest">What To Test</h2>
diff --git a/docs/html/guide/topics/testing/index.jd b/docs/html/guide/topics/testing/index.jd
index 762a897..cf87187 100644
--- a/docs/html/guide/topics/testing/index.jd
+++ b/docs/html/guide/topics/testing/index.jd
@@ -73,6 +73,7 @@ page.title=Testing
         to test applications and devices.
     </li>
 </ul>
+<!--
 <h4>Samples</h4>
 <ul>
     <li>
@@ -82,3 +83,4 @@ page.title=Testing
         testing a {@link android.app.Service}.
     </li>
 </ul>
+-->
diff --git a/docs/html/guide/topics/testing/what_to_test.jd b/docs/html/guide/topics/testing/what_to_test.jd
index e13538a..e8a27da 100644
--- a/docs/html/guide/topics/testing/what_to_test.jd
+++ b/docs/html/guide/topics/testing/what_to_test.jd
@@ -79,6 +79,6 @@ page.title=What To Test
     <a href="{@docRoot}guide/developing/tools/emulator.html#netspeed">Network Speed Emulation</a>.
     To test GPS, you can use the emulator console and {@link android.location.LocationManager}. To
     learn more about the emulator console, please see
-    <a href="{@docRoot}/guide/developing/tools/emulator.html#console">
+    <a href="{@docRoot}guide/developing/tools/emulator.html#console">
     Using the Emulator Console</a>.
 </p>