docs: MOAR links

Change-Id: I4bc1947f84dab16692065957a3a955d7338d4262

10 files changed, 27 insertions, 69 deletions

diff --git a/docs/html/about/versions/android-3.0.jd b/docs/html/about/versions/android-3.0.jd
index aaed6bf62414..76e07959135e 100644
--- a/docs/html/about/versions/android-3.0.jd
+++ b/docs/html/about/versions/android-3.0.jd
@@ -189,11 +189,9 @@ before attempting to paste it.</p>
 object) at a time, but one {@link android.content.ClipData} can contain multiple {@link
 android.content.ClipData.Item}s.</p>
 
-<p>For more information, read the <a href="{@docRoot}guide/topics/clipboard/copy-paste.html">Copy
-and Paste</a> documentation. You can also see a simple implementation of copy and paste in the <a
-href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/content/ClipboardSample.html">API Demos</a>
-and a more complete implementation in the <a
-href="{@docRoot}resources/samples/NotePad/index.html">Note Pad</a> application.</p>
+<p>For more information, read the <a href="{@docRoot}guide/topics/text/copy-paste.html">Copy
+and Paste</a> documentation. You can also see a simple implementation of copy and paste in the API Demos
+sample and a more complete implementation in the Note Pad sample.</p>
 
 
 
diff --git a/docs/html/about/versions/android-3.2.jd b/docs/html/about/versions/android-3.2.jd
index 03119ac2e5b4..02111a058737 100644
--- a/docs/html/about/versions/android-3.2.jd
+++ b/docs/html/about/versions/android-3.2.jd
@@ -238,7 +238,7 @@ size qualifiers</a>.</p>
 <h4>New manifest attributes for screen-size compatibility</h4>
 
 <p>The framework offers a new set of <a
-href="{@docRoot}"><code>&lt;supports-screens&gt;</code></a> manifest attributes that let
+href="{@docRoot}guide/topics/manifest/supports-screens-element.html"><code>&lt;supports-screens&gt;</code></a> manifest attributes that let
 you manage your app's support for different screen sizess.
 Specifically, you can specify the largest and smallest screens on which your app
 is designed to run, as well as the largest screen on which it is designed run
diff --git a/docs/html/about/versions/android-4.0.jd b/docs/html/about/versions/android-4.0.jd
index 2258371bbee7..bea07253c87b 100644
--- a/docs/html/about/versions/android-4.0.jd
+++ b/docs/html/about/versions/android-4.0.jd
@@ -1725,7 +1725,7 @@ main thread. See the
 <a href="{@docRoot}guide/components/loaders.html">Loaders</a> developer guide.</li>
       <li>System clipboard: Applications can copy and paste data (beyond mere text) to and from
 the system-wide clipboard. Clipped data can be plain text, a URI, or an intent. See the
-<a href="{@docRoot}guide/topics/clipboard/copy-paste.html">Copy and Paste</a> developer guide.</li>
+<a href="{@docRoot}guide/topics/text/copy-paste.html">Copy and Paste</a> developer guide.</li>
       <li>Drag and drop: A set of APIs built into the view framework that facilitates drag and drop
 operations. See the
 <a href="{@docRoot}guide/topics/ui/drag-drop.html">Drag and Drop</a> developer guide.</li>
diff --git a/docs/html/guide/components/tasks-and-back-stack.jd b/docs/html/guide/components/tasks-and-back-stack.jd
index d137db013fac..8b7041cef826 100644
--- a/docs/html/guide/components/tasks-and-back-stack.jd
+++ b/docs/html/guide/components/tasks-and-back-stack.jd
@@ -29,14 +29,13 @@ to perform other tasks without losing their work</li>
 
 <h2>Articles</h2>
 <ol>
-  <li><a href="{@docRoot}resources/articles/multitasking-android-way.html">Multitasking the Android Way</a></li>
+  <li><a href="http://android-developers.blogspot.com/2010/04/multitasking-android-way.html">Multitasking the Android Way</a></li>
 </ol>
 
 <h2>See also</h2>
 <ol>
   <li><a href="{@docRoot}design/patterns/navigation.html">Android Design:
 Navigation</a></li>
-  <li><a href="{@docRoot}videos/index.html#v=fL6gSd4ugSI">Application Lifecycle video</a></li>
   <li><a
 href="{@docRoot}guide/topics/manifest/activity-element.html">{@code &lt;activity&gt;} manifest
 element</a></li>
diff --git a/docs/html/tools/help/MonkeyDevice.jd b/docs/html/tools/help/MonkeyDevice.jd
index ae837e9ed970..e7612e664093 100644
--- a/docs/html/tools/help/MonkeyDevice.jd
+++ b/docs/html/tools/help/MonkeyDevice.jd
@@ -16,7 +16,7 @@ parent.link=index.html
 <p>
     You normally do not have to create an instance of <code>MonkeyDevice</code>. Instead, you
     use
-<code><a href="{@docRoot}tools/MonkeyRunner.html#waitForConnection">
+<code><a href="{@docRoot}tools/help/MonkeyRunner.html#waitForConnection">
 MonkeyRunner.waitForConnection()</a></code> to create a new object from a connection to a device or
 emulator. For example, instead of
 using:</p>
@@ -299,7 +299,7 @@ newdevice = MonkeyRunner.waitForConnection()
         <td class="jd-typecol">
             <nobr>
                 <code>
-                <a href="{@docRoot}tools/MonkeyImage.html">
+                <a href="{@docRoot}tools/help/MonkeyImage.html">
                         MonkeyImage
                     </a>
                 </code>
@@ -314,7 +314,7 @@ newdevice = MonkeyRunner.waitForConnection()
             <div class="jd-descrdiv">
                 Captures the entire screen buffer of this device, yielding a
                 <code>
-                <a href="{@docRoot}tools/MonkeyImage.html">
+                <a href="{@docRoot}tools/help/MonkeyImage.html">
                         MonkeyImage
                 </a>
                 </code> object containing a screen capture of the current display.
@@ -1033,7 +1033,7 @@ newdevice = MonkeyRunner.waitForConnection()
     <h4 class="jd-details-title">
       <span class="normal">
         <code>
-            <a href="{@docRoot}tools/MonkeyImage.html">
+            <a href="{@docRoot}tools/help/MonkeyImage.html">
                 MonkeyImage
             </a>
         </code>
@@ -1054,7 +1054,7 @@ newdevice = MonkeyRunner.waitForConnection()
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist">
         <li>
-            A <a href="{@docRoot}tools/MonkeyImage.html">
+            A <a href="{@docRoot}tools/help/MonkeyImage.html">
             MonkeyImage</a> object containing the image of the current display.
         </li>
       </ul>
diff --git a/docs/html/tools/help/MonkeyImage.jd b/docs/html/tools/help/MonkeyImage.jd
index 341bb05c5040..79f49489640e 100644
--- a/docs/html/tools/help/MonkeyImage.jd
+++ b/docs/html/tools/help/MonkeyImage.jd
@@ -14,7 +14,7 @@ parent.link=index.html
 </p>
 <p>
     You do not need to create new instances of <code>MonkeyImage</code>. Instead, use
-<code><a href="{@docRoot}tools/MonkeyDevice.html#takeSnapshot">
+<code><a href="{@docRoot}tools/help/MonkeyDevice.html#takeSnapshot">
 MonkeyDevice.takeSnapshot()</a></code> to create a new instance from a screenshot. For example, use:
 </p>
 <pre>
@@ -88,7 +88,7 @@ newimage = MonkeyDevice.takeSnapshot()
         <td class="jd-typecol">
             <nobr>
                 <code>
-                    <a href="{@docRoot}tools/MonkeyImage.html">MonkeyImage</a>
+                    <a href="{@docRoot}tools/help/MonkeyImage.html">MonkeyImage</a>
                 </code>
             </nobr>
         </td>
@@ -116,7 +116,7 @@ newimage = MonkeyDevice.takeSnapshot()
                 <span class="sympad">
                     <a href="#sameAs">sameAs</a>
                 </span>
-         (<code><a href="{@docRoot}tools/MonkeyImage.html">MonkeyImage</a></code>
+         (<code><a href="{@docRoot}tools/help/MonkeyImage.html">MonkeyImage</a></code>
             other,
             <em>float</em> percent)
             </nobr>
@@ -291,7 +291,7 @@ newimage = MonkeyDevice.takeSnapshot()
     <h4 class="jd-details-title">
       <span class="normal">
           <code>
-              <a href="{@docRoot}tools/MonkeyImage.html">MonkeyImage</a>
+              <a href="{@docRoot}tools/help/MonkeyImage.html">MonkeyImage</a>
           </code>
       </span>
       <span class="sympad">getSubImage</span>
@@ -344,7 +344,7 @@ newimage = MonkeyDevice.takeSnapshot()
       <span class="normal">
       (
        <code>
-           <a href="{@docRoot}tools/MonkeyImage.html">MonkeyImage</a>
+           <a href="{@docRoot}tools/help/MonkeyImage.html">MonkeyImage</a>
        </code> otherImage,
        <em>float</em> percent
       )
diff --git a/docs/html/tools/help/MonkeyRunner.jd b/docs/html/tools/help/MonkeyRunner.jd
index e788ae1eb087..a924d2dcaf71 100644
--- a/docs/html/tools/help/MonkeyRunner.jd
+++ b/docs/html/tools/help/MonkeyRunner.jd
@@ -118,7 +118,7 @@ parent.link=index.html
         <td class="jd-typecol">
             <nobr>
                 <code>
-                    <a href="{@docRoot}tools/MonkeyDevice.html">MonkeyDevice</a>
+                    <a href="{@docRoot}tools/help/MonkeyDevice.html">MonkeyDevice</a>
                 </code>
             </nobr>
         </td>
@@ -395,7 +395,7 @@ parent.link=index.html
     <h4 class="jd-details-title">
       <span class="normal">
           <code>
-              <a href="{@docRoot}tools/MonkeyDevice.html">MonkeyDevice</a>
+              <a href="{@docRoot}tools/help/MonkeyDevice.html">MonkeyDevice</a>
           </code>
       </span>
       <span class="sympad">waitForConnection</span>
@@ -438,7 +438,7 @@ parent.link=index.html
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist">
         <li>
-          A <code><a href="{@docRoot}tools/MonkeyDevice.html">MonkeyDevice</a></code>
+          A <code><a href="{@docRoot}tools/help/MonkeyDevice.html">MonkeyDevice</a></code>
           instance for the device or emulator. Use this object to control and communicate with the
           device or emulator.
         </li>
diff --git a/docs/html/tools/help/monkeyrunner_concepts.jd b/docs/html/tools/help/monkeyrunner_concepts.jd
index 7381c5d92158..c37e64d64525 100644
--- a/docs/html/tools/help/monkeyrunner_concepts.jd
+++ b/docs/html/tools/help/monkeyrunner_concepts.jd
@@ -94,11 +94,11 @@ parent.link=index.html
 <h2 id="SampleProgram">A Simple monkeyrunner Program</h2>
 <p>
     Here is a simple monkeyrunner program that connects to a device, creating a
-    <code><a href="{@docRoot}tools/MonkeyDevice.html">MonkeyDevice</a></code>
+    <code><a href="{@docRoot}tools/help/MonkeyDevice.html">MonkeyDevice</a></code>
     object. Using the <code>MonkeyDevice</code> object, the program installs an Android application
     package, runs one of its activities, and sends key events to the activity.
     The program then takes a screenshot of the result, creating a
-    <code><a href="{@docRoot}tools/MonkeyImage.html">MonkeyImage</a></code> object.
+    <code><a href="{@docRoot}tools/help/MonkeyImage.html">MonkeyImage</a></code> object.
     From this object, the program writes out a <code>.png</code> file containing the screenshot.
 </p>
 <pre>
@@ -141,19 +141,19 @@ result.writeToFile('myproject/shot1.png','png')
 </p>
 <ul>
     <li>
-        <code><a href="{@docRoot}tools/MonkeyRunner.html">MonkeyRunner</a></code>:
+        <code><a href="{@docRoot}tools/help/MonkeyRunner.html">MonkeyRunner</a></code>:
         A class of utility methods for monkeyrunner programs. This class provides a method for
         connecting monkeyrunner to a device or emulator. It also provides methods for
         creating UIs for a monkeyrunner program and for displaying the built-in help.
     </li>
     <li>
-        <code><a href="{@docRoot}tools/MonkeyDevice.html">MonkeyDevice</a></code>:
+        <code><a href="{@docRoot}tools/help/MonkeyDevice.html">MonkeyDevice</a></code>:
         Represents a device or emulator. This class provides methods for installing and
         uninstalling packages, starting an Activity, and sending keyboard or touch events to an
         application. You also use this class to run test packages.
     </li>
     <li>
-        <code><a href="{@docRoot}tools/MonkeyImage.html">MonkeyImage</a></code>:
+        <code><a href="{@docRoot}tools/help/MonkeyImage.html">MonkeyImage</a></code>:
         Represents a screen capture image. This class provides methods for capturing screens,
         converting bitmap images to various formats, comparing two MonkeyImage objects, and
         writing an image to a file.
diff --git a/docs/html/tools/publishing/publishing_overview.jd b/docs/html/tools/publishing/publishing_overview.jd
index a034bad02b24..572766c9d05a 100755
--- a/docs/html/tools/publishing/publishing_overview.jd
+++ b/docs/html/tools/publishing/publishing_overview.jd
@@ -35,7 +35,7 @@ publish an Android application you perform two main tasks:</p>
   </li>
 </ul>
 
-<p>Usually, you release your application through an application marketplace, such as <a href="{@docRoot}distributing/index.html">Google Play</a>.
+<p>Usually, you release your application through an application marketplace, such as <a href="{@docRoot}distribute/index.html">Google Play</a>.
 However, you can also release applications by sending them directly to users or by letting users
 download them from your own website.</p>
 
@@ -128,7 +128,7 @@ Google Play you have access to a suite of developer tools that let you analyze y
 identify market trends, and control who your applications are being distributed to. You also have
 access to several revenue-enhancing features such as <a
 href="{@docRoot}guide/google/play/billing/index.html">in-app billing</a> and <a
-href="{@docRoot}guide/google/play/licensing/licensing.html">application licensing</a>. The rich array of tools
+href="{@docRoot}guide/google/play/licensing/index.html">application licensing</a>. The rich array of tools
 and features, coupled with numerous end-user community features, makes Google Play the premier
 marketplace for selling and buying Android applications.</p>
 
@@ -157,7 +157,7 @@ marketplace for selling and buying Android applications.</p>
   </li>
 </ul>
 
-<p>For information complete information, see <a href="{@docRoot}distributing/index.html">Google Play</a>.</p>
+<p>For information complete information, see <a href="{@docRoot}distribute/index.html">Google Play</a>.</p>
 
 
 <h3 id="publishing-email">Releasing your application through email</h3>
diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs
index f3544ffc02df..77a68371a885 100644
--- a/docs/html/training/training_toc.cs
+++ b/docs/html/training/training_toc.cs
@@ -346,29 +346,6 @@
           </li>
         </ul>
       </li>
-      <li class="nav-section">
-        <div class="nav-section-header"><a href="<?cs var:toroot ?>training/efficient-downloads/index.html">
-            <span class="en">Transferring Data Without Draining the Battery</span>
-          </a></div>
-        <ul>
-          <li><a href="<?cs var:toroot ?>training/efficient-downloads/efficient-network-access.html">
-            <span class="en">Optimizing Downloads for Efficient Network Access</span>
-          </a>
-          </li>
-          <li><a href="<?cs var:toroot ?>training/efficient-downloads/regular_updates.html">
-            <span class="en">Minimizing the Effect of Regular Updates</span>
-          </a>
-          </li>
-          <li><a href="<?cs var:toroot ?>training/efficient-downloads/redundant_redundant.html">
-            <span class="en">Redundant Downloads are Redundant</span>
-          </a>
-          </li>
-          <li><a href="<?cs var:toroot ?>training/efficient-downloads/connectivity_patterns.html">
-            <span class="en">Modifying Patterns Based on the Connectivity Type</span>
-          </a>
-          </li>
-        </ul>
-      </li>
 
       <li class="nav-section">
         <div class="nav-section-header"><a href="<?cs var:toroot ?>training/custom-views/index.html">
@@ -395,22 +372,6 @@
       </li>
 
       <li class="nav-section">
-        <div class="nav-section-header"><a href="<?cs var:toroot ?>training/cloudsync/index.html">
-            <span class="en">Syncing to the Cloud</span>
-          </a></div>
-        <ul>
-          <li><a href="<?cs var:toroot ?>training/cloudsync/aesync.html">
-            <span class="en">Syncing with App Engine</span>
-          </a>
-          </li>
-          <li><a href="<?cs var:toroot ?>training/cloudsync/backupapi.html">
-            <span class="en">Using the Backup API</span>
-          </a>
-          </li>
-        </ul>
-      </li>
-
-      <li class="nav-section">
         <div class="nav-section-header"><a href="<?cs var:toroot ?>training/search/index.html">
             <span class="en">Adding Search Functionality</span>
           </a>