am 0b8c4fa: am 752aaf9: AI 147874: Fix format and link errors in docs.

Merge commit '0b8c4faee30bb06f8e5d7cd7ecb5b8a0f8ce1624'

* commit '0b8c4faee30bb06f8e5d7cd7ecb5b8a0f8ce1624':
  AI 147874: Fix format and link errors in docs.

6 files changed, 28 insertions, 25 deletions

diff --git a/docs/html/guide/developing/tools/avd.jd b/docs/html/guide/developing/tools/avd.jd
index 1e13ace..b8f205e 100644
--- a/docs/html/guide/developing/tools/avd.jd
+++ b/docs/html/guide/developing/tools/avd.jd
@@ -69,7 +69,7 @@ your application on. </p>
 specify emulator command-line options at launch or by using the emulator
 console to change behaviors or characteristics at run time. For a complete
 reference of emulator options, please see the <a
-href="{@docRoot}/guide/developing/tools/emulator.html">Emulator</a>
+href="{@docRoot}guide/developing/tools/emulator.html">Emulator</a>
 documentation. </p>
 
 <p>To create and manage AVDs, you use the android tool provided in the Android
@@ -81,9 +81,13 @@ Other IDEs</a>, as appropriate for your environment.</p>
 
 <h2 id="creating">Creating an AVD</h2>
 
-<div class="sidebox">The Android SDK does not include any preconfigured AVDs, so
+<div class="sidebox-wrapper">
+<div class="sidebox-inner">
+<p>The Android SDK does not include any preconfigured AVDs, so
 you need to create an AVD before you can run any application in the emulator
-(even the Hello World application). </div>
+(even the Hello World application).</p>
+</div>
+</div>
 
 <p>To create an AVD, you use the android tool, a command-line utility
 available in the <code>&lt;sdk&gt;/tools/</code> directory. Managing AVDs is one
@@ -91,7 +95,7 @@ of the two main function of the android tool (the other is creating and updating
 Android projects). Open a terminal window and change to the 
 <code>&lt;sdk&gt;/tools/</code> directory, if needed</p>
 
-<p>To create each AVD, you issue the command <code>android avd create</code>,
+<p>To create each AVD, you issue the command <code>android create avd</code>,
 with options that specify a name for the new AVD and the system image you want
 to run on the emulator when the AVD is invoked. You can specify other options on
 the command line also, such as to create an emulated SD card for the new AVD, set
@@ -99,7 +103,7 @@ the emulator skin to use, or set a custom location for the AVD's files.</p>
 
 <p>Here's the command-line usage for creating an AVD: </p>
 
-<pre>android -n &lt;name&gt; -t &lt;targetID&gt; [-&lt;option&gt; &lt;value&gt;] ... </pre>
+<pre>android create avd -n &lt;name&gt; -t &lt;targetID&gt; [-&lt;option&gt; &lt;value&gt;] ... </pre>
 
 <p>You can use any name you want for the AVD, but since you are likely to be
 creating multiple AVDs, you should choose a name that lets you recognize the
diff --git a/docs/html/guide/developing/tools/emulator.jd b/docs/html/guide/developing/tools/emulator.jd
index 11c0da5..82d3c8d 100644
--- a/docs/html/guide/developing/tools/emulator.jd
+++ b/docs/html/guide/developing/tools/emulator.jd
@@ -491,8 +491,8 @@ on disk images, use <code>-help-disk-images</code>.</p>
   <td><code>-shell-serial&nbsp;&lt;device&gt;</code></td>
   <td>Enable the root shell (as in <code>-shell</code> and specify the QEMU character 
   device to use for communication with the shell.</td>
-  <td>&lt;device&gt; must be a QEMU device type. See the documentation for 'serial -dev' at 
-  <a href="http://www.bellard.org/qemu/qemu-doc.html#SEC10">http://www.bellard.org/qemu/qemu-doc.html#SEC10</a> 
+  <td>&lt;device&gt; must be a QEMU device type. See the documentation for '-serial <em>dev</em>' at 
+  <a href="http://www.nongnu.org/qemu/qemu-doc.html#SEC10">http://www.bellard.org/qemu/qemu-doc.html#SEC10</a> 
   for a list of device types.</p>
 
 <p>Here are some examples: </p>
@@ -755,7 +755,7 @@ default versions stored in the SDK. </p>
 AVDs is in <code>~/.android/avd</code> on OS X and Linux, <code>C:\Documents and 
 Settings\&lt;user&gt;\.android\</code> on Windows XP, and 
 <code>C:\Users\&lt;user&gt;\.android\</code>
-on Windows Vista<code>.</p>
+on Windows Vista.</p>
 
 <p>To let you use alternate or custom versions of the image files, the emulator
 provides startup options that override the default locations and filenames of
diff --git a/docs/html/guide/publishing/preparing.jd b/docs/html/guide/publishing/preparing.jd
index d355265..b4eaea3 100644
--- a/docs/html/guide/publishing/preparing.jd
+++ b/docs/html/guide/publishing/preparing.jd
@@ -178,8 +178,8 @@ MapView elements</h3>
 
 <div class="sidebox" style="margin-bottom:.5em;padding:1em;"><p>
 For complete information about getting a Maps API Key, see <a
-href="{@docRoot}guide/topics/location/geo/mapkey.html">Obtaining a Maps API
-Key</a>.<br></p></div>
+href="http://code.google.com/android/add-ons/google-apis/mapkey.html">
+Obtaining a Maps API Key</a>.</p></div>
 
 <p>If your application uses one or more Mapview elements, you will need to 
 register your application with the Google
@@ -221,7 +221,7 @@ to download Maps data. </li>
 </ol>
 
 <p>For more information about signing and your private key, see <a
-href="#signing">Signing Your Applications</a>.</p>
+href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>.</p>
 
 
 <h2 id="compile">Compile your application</h2>
@@ -234,7 +234,8 @@ you can compile your application for release. </p>
 <h3 id="signapp">8. Sign your application</h3>
 
 <p>Sign your application using your private key. Signing your application
-correctly is critically important. Please see <a href="#signing">Signing Your
+correctly is critically important. Please see 
+<a href="{@docRoot}guide/publishing/app-signing.html">Signing Your
 Applications</a> for complete information. </p>
 
 <h3 id="testapp">9. Test your compiled and signed application</h3>
diff --git a/docs/html/guide/topics/media/jet/jetcreator_manual.jd b/docs/html/guide/topics/media/jet/jetcreator_manual.jd
index 79d41c2..9692d97 100644
--- a/docs/html/guide/topics/media/jet/jetcreator_manual.jd
+++ b/docs/html/guide/topics/media/jet/jetcreator_manual.jd
@@ -751,7 +751,7 @@ following:</p>
 
 
 <p><img border=0 width=400 height=424
-src="{@docRoot}images/jet/image021.png"></p>
+src="{@docRoot}images/jet/jc_moveseg_wnd.png"></p>
 
 
 
diff --git a/docs/html/guide/tutorials/hello-world.jd b/docs/html/guide/tutorials/hello-world.jd
index a888529..4d1e9cd 100644
--- a/docs/html/guide/tutorials/hello-world.jd
+++ b/docs/html/guide/tutorials/hello-world.jd
@@ -34,9 +34,14 @@ here when you've completed the installation.</p>
 
 <h2 id="avd">Create an AVD</h2>
 
-<p class="note"><strong>Note:</strong> If you're developing with an Android SDK older
-than the one provided for Android 1.5, you can skip this step and continue with
-<a href="#create">Create the Project</a>.</p>
+<div class="sidebox-wrapper">
+  <div class="sidebox-inner">
+    <p>To learn more about how to use AVDs and the options 
+       available to you, refer to the 
+       <a href="{@docRoot}guide/developing/tools/avd.html">Android 
+       Virtual Devices</a> document.</p>
+  </div>
+</div>
 
 <p>In this tutorial, you will run your application in the Android Emulator.
 Before you can launch the emulator, you must create an 
@@ -55,13 +60,6 @@ For the time being, press Return to skip it ("no" is the default response).
 That's it. This configures an AVD named "my_avd" that uses the Android 1.5
 platform. The AVD is now ready for use in the emulator.</p>
 
-<div class="sidebox-wrapper">
-  <div class="sidebox-inner">
-    <p>To learn more about Android Virtual Devices (and targets), refer to the 
-    <a href="{@docRoot}guide/developing/tools/avd.html">AVD</a> document.</p>
-  </div>
-</div>
-
 <p>In the above command, the <code>--target</code> option is required 
 and specifies the deployment target to run on the emulator.
 The <code>--name</code> option is also required and defines the 
@@ -247,7 +245,7 @@ to see it running.</p>
 <div class="sidebox-wrapper">
   <div class="sidebox-inner">
     <p>To learn more about creating and editing run configurations in Eclipse, refer to
-    <a href="{@docRoot}guide/developing/tools/eclipse-adt.html#RunConfig">Developing In Eclipse, 
+    <a href="{@docRoot}guide/developing/eclipse-adt.html#RunConfig">Developing In Eclipse, 
     with ADT</a>.</p>
   </div>
 </div>
diff --git a/docs/html/sdk/android-1.5-highlights.jd b/docs/html/sdk/android-1.5-highlights.jd
index b0e5f57..e6c4f88 100644
--- a/docs/html/sdk/android-1.5-highlights.jd
+++ b/docs/html/sdk/android-1.5-highlights.jd
@@ -17,7 +17,7 @@ The list below provides an overview of the changes. </p>
 <li><a href="#apis">New APIs and Manifest Elements</a>
 </ul>
 
-<h2 id="ui">User Interface Refinements</h4>
+<h2 id="ui">User Interface Refinements</h2>
 <ul>
     <li>System-wide:
       <ul>