diff --git a/docs/html/guide/appendix/faq/commontasks.jd b/docs/html/guide/appendix/faq/commontasks.jd
index 9c79bdd..0f89e75 100644
--- a/docs/html/guide/appendix/faq/commontasks.jd
+++ b/docs/html/guide/appendix/faq/commontasks.jd
@@ -701,8 +701,8 @@
 
 <a name="filelist" id="filelist"></a><h2>List of Files for an Android Application</h2>
 <p>The following list describes the structure and files of an Android application.
-    Many of these files can be built for you (or stubbed out) by the activitycreator
-    application shipped in the tools/ menu of the SDK. </p>
+    Many of these files can be built for you (or stubbed out) by the android tool
+    shipped in the tools/ menu of the SDK. </p>
 <table width="100%" border="0">
     <tr>
         <td width="28%" valign="top">MyApp/<br /></td>
diff --git a/docs/html/guide/developing/tools/index.jd b/docs/html/guide/developing/tools/index.jd
index b491a4f..e53d595 100644
--- a/docs/html/guide/developing/tools/index.jd
+++ b/docs/html/guide/developing/tools/index.jd
@@ -8,23 +8,29 @@
 Emulator and the Android Development Tools plugin for Eclipse, but the SDK also 
 includes a variety of other tools for debugging, packaging, and installing your 
 applications on the emulator. </p>
-
-<dl>
-    <dt><a href="emulator.html">Android Emulator</a></dt>
-    <dd>A virtual mobile device that runs on your computer. You use the emulator to design, 
-    debug, and test your applications in an actual Android run-time environment. </dd>
     
+ <dl>
   <dt><a href="adt.html">Android Development Tools Plugin</a> (for the Eclipse IDE)</dt>
           <dd>The ADT plugin adds powerful extensions to the Eclipse integrated environment, 
           making creating and debugging your Android applications easier and faster. If you 
           use Eclipse, the ADT plugin gives you an incredible boost in developing Android 
           applications.</dd>
+  <dt><a href="emulator.html">Android Emulator</a></dt>
+    <dd>A QEMU-based device-emulation tool that you can use to design, 
+    debug, and test your applications in an actual Android run-time environment. </dd>
 
-	  <dt><a href="hierarchy-viewer.html">Hierarchy Viewer</a></dt>
-	    <dd>The Hierarchy Viewer tool allows you to debug and optimize your user interface.
-	    It provides a visual representation of your layout's hierarchy of Views and a magnified inspector
-	    of the current display with a pixel grid, so you can get your layout just right.
-	    </dd>
+  <dt><a href="emulator.html">Android Virtual Devices (AVDs)</a></dt>
+    <dd>Virtual device configurations that you create, to model device
+        characteristics in the Android Emulator. In each configuration, you can
+        specify the Android platform to run, the hardware options, and the
+        emulator skin to use. Each AVD functions as an independent device with 
+        it's own storage for user data, SD card, and so on. </dd>
+
+ <dt><a href="hierarchy-viewer.html">Hierarchy Viewer</a></dt>
+    <dd>The Hierarchy Viewer tool allows you to debug and optimize your user interface.
+        It provides a visual representation of your layout's hierarchy of Views and a magnified inspector
+        of the current display with a pixel grid, so you can get your layout just right.
+    </dd>
 
 	  <dt><a href="draw9patch.html">Draw 9-patch</a></dt>
 	    <dd>The Draw 9-patch tool allows you to easily create a 
@@ -79,10 +85,9 @@
       level events.  You can use the Monkey to stress-test applications that you are developing,
       in a random yet repeatable manner.</dd>
 
-  <dt><a  href="othertools.html#activitycreator">activitycreator</a></dt>
-            <dd>A script that generates <a
+  <dt><a  href="othertools.html#android">android</a></dt>
+            <dd>A script that lets you manage AVDs and generate <a
                         href="http://ant.apache.org/" title="Ant">Ant</a> build files that 
-                        you can use to compile your Android applications. If you are developing 
-                        on Eclipse with the ADT plugin, you won't need to use this script. </dd>
+                        you can use to compile your Android applications. </dd>
 </dl>
 
diff --git a/docs/html/guide/developing/tools/othertools.jd b/docs/html/guide/developing/tools/othertools.jd
index eaa0b76..603609e 100644
--- a/docs/html/guide/developing/tools/othertools.jd
+++ b/docs/html/guide/developing/tools/othertools.jd
@@ -3,16 +3,32 @@
 
 <p>The sections below describe other tools that you can use when building Android applications. </p>
 
-<p>All of the tools are included in the Android SDK and are accessible from the <code>tools/</code> directory.</p>
+<p>All of the tools are included in the Android SDK and are accessible from the <code>&lt;sdk&gt;/tools/</code> directory.</p>
 
 <h2>Contents</h2>
 
 <dl>
+    <dt><a href="#android">android</a></dd>
     <dt><a href="#mksdcard">mksdcard</a></dt>
     <dt><a href="#dx">dx</a></dt>
-    <dt><a href="#activitycreator">activitycreator</a></dd>
 </dl>
 
+<a name="activitycreator"></a>
+<h2 id="android">android</h2>
+
+<p>The android tool is a script that lets you create and manage Android Virtual Devices (AVDs) and, if you are developing using Ant, generate template Android projects to help you get started quickly. </p>
+
+<p>For information about how to use the android tool to manage AVDs, see <a href="{@docRoot}guide/developing/tools/avd.html">Android Virtual Devices</a>. </p>
+
+<p>For information about how to use the android tool to create or update a project, see <a href="{@docRoot}guide/developing/other-ide.html">Developing in Other IDEs</a>. </p>
+
+<p>Note that if you are developing in Eclipse with the ADT plugin, you will use the android tool to manage the AVDs you create, but you will not use the android tool for creating a project. The ADT plugin provides a New Project Wizard that helps you set up an Android project in Eclipse. </p>
+
+<p>If you are developing in Ant, you will use the android tool to manage your AVDs, and you can also use it to create or update a project. </p>
+
+<p class="note">Note: The android tool replaces the activitycreator tool provided in previous SDK releases.</p>
+
+
 <a name="mksdcard"></a>
 
 <h2>mksdcard</h2>
@@ -21,7 +37,7 @@
 
 <pre>mksdcard [-l label] &lt;size&gt;[K|M] &lt;file&gt;</pre>
 
-</p>The table below lists the available options/arguments</p>
+<p>The table below lists the available options/arguments</p>
 
 <table>
 <tr>
@@ -57,48 +73,6 @@
 
 <p>The dx tool lets you generate Android bytecode from .class files. The tool converts target files and/or directories to Dalvik executable format (.dex) files, so that they can run in the Android environment. It can also dump the class files in a human-readable format and run a target unit test. You can get the usage and options for this tool by using <code>dx --help</code>.</p>
 
-<a name="activitycreator"></a>
 
-<h2>activitycreator</h2>
-
-<p>If you aren't using the Eclipse IDE and ADT plugin, you can use the the activitycreator script to get started with a new application. When you run the script, it creates the structure of a minimal Android application that you can build on and extend to meet your needs. </p>
-
-<p>For Linux and Mac, the SDK provides <code>activitycreator</code>, a shell script, and for Windows <code>activitycreator.bat</code>, a batch script that runs an executable. Regardless of platform, the usage for the script is the same:</p>
-
-<pre>activitycreator [--out &lt;folder&gt;] [--ide intellij] your.package.name.ActivityName</pre>
-
-<table>
-<tr>
-	<th>Option</th>
-	<th>Description</th>
-</tr>
-
-<tr>
-	<td><code>--out &lt;folder&gt;</code></td>
-	<td>Specifies where to create the files/folders. </td>
-</tr>
-
-<tr>
-	<td><code>--ide intellij</code></td>
-	<td>Creates project files for IntelliJ</td>
-</tr>
-
-</table>
-
-
-<p>When run, the script creates these files: </p>
-
- <ul>
-	<li>AndroidManifest.xml -- The application manifest file.</li>
-	<li>build.xml -- An Ant script to build/package the application.</li>
-	<li>res -- The resource directory.</li>
-	<li>src -- The source directory.</li>
-	<li>src/your/package/name/ActivityName.java -- The Activity class. </li>
-	<li>bin -- The output folder for the compiled .apk (when built by Ant).</li>
-</ul>
-
-<p>When you are ready, you can use Ant to <a href="{@docRoot}guide/developing/other-ide.html#antbuild">build the project</a> so that you can run it on the emulator.</p>
-
-<p>If you are using Eclipse with the ADT plugin, you do not need to use activitycreator. You can use the New Project Wizard, provided by the ADT plugin, instead. </p>
 
 
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index 77d3522..3c9b7c2 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -61,6 +61,7 @@
             <li><a href="<?cs var:toroot ?>guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></li>
             <li><a href="<?cs var:toroot ?>guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></li>
             <li><a href="<?cs var:toroot ?>guide/topics/manifest/service-element.html">&lt;service&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-configuration-element.html">&lt;uses-configuration&gt;</a></li>
             <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-library-element.html">&lt;uses-library&gt;</a></li>
             <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></li>
             <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk&gt;</a></li>
@@ -84,7 +85,7 @@
             <li><a style="color:gray;">Accelerometer</a></li>
           </ul>
       </li> -->
-      <li><a href="<?cs var:toroot ?>guide/topics/location/index.html">Location</a></li>
+      <li><a href="<?cs var:toroot ?>guide/topics/location/index.html">Location and Maps</a></li>
 <!--    <li class="toggle-list">
         <div><a style="color:gray;">Wireless Controls</a></div>
           <ul>
@@ -100,7 +101,6 @@
     <ul>
       <!--       <li><a style="color:gray;">Developing for Android</a></li>
       signing, upgrading, selecting a package name, select device profile, touch, trackball, dpad available, etc. -->
-
       <li><a href="<?cs var:toroot ?>guide/developing/eclipse-adt.html">In Eclipse, with ADT</a></li>
       <li><a href="<?cs var:toroot ?>guide/developing/other-ide.html">In Other IDEs</a></li>
       <li><a href="<?cs var:toroot ?>guide/developing/device.html">On a Device</a></li>
@@ -110,9 +110,10 @@
           <ul>
 			<li><a href="<?cs var:toroot ?>guide/developing/tools/aapt.html">aapt</a></li>
 			<li><a href="<?cs var:toroot ?>guide/developing/tools/adb.html">adb</a></li>
-			<li><a href="<?cs var:toroot ?>guide/developing/tools/othertools.html#activitycreator">activitycreator</a></li>
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/othertools.html#android">android</a></li>
 <!--			<li><a href="<?cs var:toroot ?>guide/developing/tools/adt.html">ADT Plugin</a></li>-->
 			<li><a href="<?cs var:toroot ?>guide/developing/tools/aidl.html" >aidl</a></li>
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/avd.html" >AVDs</a></li>
 			<li><a href="<?cs var:toroot ?>guide/developing/tools/ddms.html" >ddms</a></li>
 			<li><a href="<?cs var:toroot ?>guide/developing/tools/othertools.html#dx">dx</a></li>
 			<li><a href="<?cs var:toroot ?>guide/developing/tools/draw9patch.html">Draw 9-Patch</a></li>
diff --git a/docs/html/samples/index.jd b/docs/html/samples/index.jd
index c5c0b71..06afd07 100644
--- a/docs/html/samples/index.jd
+++ b/docs/html/samples/index.jd
@@ -18,6 +18,5 @@
 
 <p>To run these samples, you should <a
 href="{@docRoot}guide/developing/eclipse-adt.html#creatingaproject">import them into
-Eclipse</a> or <a href="{@docRoot}guide/developing/other-ide.html">use
-activitycreator.py</a>, as described in the <a
-href="{@docRoot}sdk/1.1_r1/installing.html">Installing the SDK</a>.</p>
+Eclipse</a> or build them with Ant, as described in 
+<a href="{@docRoot}guide/developing/other-ide.html#Building">Developing in Other IDEs</a>.</p>