diff --git a/docs/html/index.jd b/docs/html/index.jd
index dc8bf2fe51790..9d349ca27f585 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -20,7 +20,7 @@ home=true
                                 </div> <!-- end annoucement -->
                             </div> <!-- end annoucement-block -->  
                         </div><!-- end topAnnouncement -->
-                        <div id="carouselMain" style="height:190px"> <!-- this height can be adjusted based on the content height -->
+                        <div id="carouselMain" style="height:215px"> <!-- this height can be adjusted based on the content height -->
                         </div>
                             <div class="clearer"></div>
                         <div id="carouselWheel">
@@ -46,8 +46,8 @@ home=true
                                       <td class="imageCell"><a href="{@docRoot}sdk/index.html"><img src="{@docRoot}assets/images/icon_download.jpg" style="padding:0" /></a></td>
                                       <td>
                                               <h2 class="green">Download</h2>
-                                              <p>The Android SDK has the tools, sample code, and docs you need to create great apps.  </p>
-                                              <p><a href="{@docRoot}sdk/{@sdkCurrent}/index.html">Learn more &raquo;</a></p>
+                                              <p>The Android SDK  the tools, sample code, and docs you need to create great apps.</p>
+                                              <p><a href="{@docRoot}sdk/index.html">Learn more &raquo;</a></p>
                                       </td>
                               </tr>
                               <tr>
@@ -79,7 +79,7 @@ home=true
                                       <td class="imageCell"><a href="http://www.youtube.com/user/androiddevelopers"><img src="{@docRoot}assets/images/video-droid.png" style="padding:0" /></a></td>
                                       <td>
                                               <h2 class="green">Watch</h2>
-                                              <object width="150" height="140"><param name="movie" value="http://www.youtube.com/v/GARMe7Km_gk&hl=en&fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/GARMe7Km_gk&hl=en&fs=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="150" height="140"></embed></object>
+                                              <object width="150" height="140"><param name="movie" value="http://www.youtube.com/v/N6YdwzAvwOA&hl=en&fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/N6YdwzAvwOA&hl=en&fs=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="150" height="140"></embed></object>
                                               <p style="margin-top:1em"><a href="{@docRoot}videos/index.html">More Android videos &raquo;</a></p>
                                       </td>
                               </tr>
@@ -120,24 +120,25 @@ home=true
     'sdk': {
       'layout':"imgLeft",
       'icon':"sdk-small.png",
-      'name':"Android 1.6 SDK",
-      'img':"donut-android.png",
-      'title':"Android 1.6 SDK",
-      'desc': "<p>The Android 1.6 SDK is now available, with new APIs and updated tools!</p>"
-               + " <p>For more about the Android 1.6 platform, read the <a href='http://developer.android.com/sdk/android-1.6-highlights.html'>highlights</a>"
-               + "<!--and watch some <a href='http://developer.android.com/videos/index.html'>videos</a>-->."
-               + " Also keep an eye on the <a href='http://android-developers.blogspot.com'>Blog</a>"
-               + " for posts about some of the new developer technologies in Android 1.6.</p>"
-               + "<p><a href='{@docRoot}sdk/1.6_r1/index.html'>Download the Android 1.6 SDK &raquo;</a></p>"
+      'name':"Android 2.0",
+      'img':"eclair-android.png",
+      'title':"Android 2.0 has arrived!",
+      'desc': "<p>Android 2.0 includes exciting new features and APIs. "
+               + "For information about what's included in the new platform, read "
+               + "the <a href='{@docRoot}sdk/android-2.0.html'>Android 2.0 version notes</a>.</p>"
+               + "<p>If you have the Android 1.6 SDK, you can update your environment "
+               + "by installing the Android 2.0 platform and updated tools as "
+               + "<a href='{@docRoot}sdk/adding-components.html'>SDK components</a>. Otherwise, "
+               + "<a href='{@docRoot}sdk/index.html'>download a new Android SDK</a>.</p>"
     },
 
-    'io': {
+    'devphone': {
       'layout':"imgLeft",
-      'icon':"io-small.png",
-      'name':"Google I/O",
-      'img':"io-large.png",
-      'title':"Google I/O Developer Conference",
-      'desc': "<p>The Google I/O developer conference took place May 27-28 in San Francisco. If you missed the conference, you can experience the Android sessions by viewing YouTube videos.</p><p><a href='{@docRoot}videos/index.html'>See the sessions from Google I/O &raquo;</a></p>"
+      'icon':"devphone-small.png",
+      'name':"Dev Phone 1",
+      'img':"devphone-large.png",
+      'title':"Android Dev Phone 1",
+      'desc': "<p>Run and debug your Android applications directly on this device. Modify and rebuild the Android operating system, and flash it onto the phone. The Android Dev Phone 1 is carrier independent, and available for purchase by any developer registered with <a href='http://market.android.com/publish'>Android Market</a>.</p><p><a href='/guide/developing/device.html#dev-phone-1'>Learn more about the Android Dev Phone 1 &raquo;</a></p>"
     },
 
     'mapskey': {
@@ -149,13 +150,13 @@ home=true
       'desc':"<p>If you're writing an Android application that uses Google Maps (with MapView), you must register your application to obtain a Maps API Key. Without the key, your maps application will not work on Android devices. Obtaining a key requires just a couple of steps.</p><p><a href='http://code.google.com/android/add-ons/google-apis/maps-overview.html'>Learn more &raquo;</a></p>"
     },
 
-    'devphone': {
+    'io': {
       'layout':"imgLeft",
-      'icon':"devphone-small.png",
-      'name':"Dev Phone 1",
-      'img':"devphone-large.png",
-      'title':"Android Dev Phone 1",
-      'desc': "<p>Run and debug your Android applications directly on this device. Modify and rebuild the Android operating system, and flash it onto the phone. The Android Dev Phone 1 is carrier independent, and available for purchase by any developer registered with <a href='http://market.android.com/publish'>Android Market</a>.</p><p><a href='/guide/developing/device.html#dev-phone-1'>Learn more about the Android Dev Phone 1 &raquo;</a></p>"
+      'icon':"io-small.png",
+      'name':"Google I/O",
+      'img':"io-large.png",
+      'title':"Google I/O Developer Conference",
+      'desc': "<p>The Google I/O developer conference took place May 27-28 in San Francisco. If you missed the conference, you can experience the Android sessions by viewing YouTube videos.</p><p><a href='{@docRoot}videos/index.html'>See the sessions from Google I/O &raquo;</a></p>"
     }
 
   }
diff --git a/docs/html/intl/ja/index.jd b/docs/html/intl/ja/index.jd
index 3ed2357992350..8096247e4e1b0 100644
--- a/docs/html/intl/ja/index.jd
+++ b/docs/html/intl/ja/index.jd
@@ -45,7 +45,7 @@ home=true
                                       <td>
                                               <h2 class="green">ダウンロード</h2>
                                               <p>Android SDK には、優れたアプリケーションの作成に必要となるツール、サンプル コード、ドキュメントが含まれています。  </p>
-                                              <p><a href="{@docRoot}sdk/{@sdkCurrent}/index.html">詳細 &raquo;</a></p>
+                                              <p><a href="{@docRoot}sdk/index.html">詳細 &raquo;</a></p>
                                       </td>
                               </tr>
                               <tr>
@@ -118,10 +118,10 @@ home=true
     'sdk': {
       'layout':"imgLeft",
       'icon':"sdk-small.png",
-      'name':"SDK 1.6 r1",
-      'img':"donut-android.png",
-      'title':"Android 1.6 SDK",
-      'desc': "<p>Android 1.6 SDK の最新バージョンが公開されました。このリリースには Android 1.6 用の API、最新版デベロッパーツール、複数プラットフォーム(バージョン)サポート、そして Google API のアドオンが含まれています。</p><p><a href='{@docRoot}sdk/1.6_r1/index.html'>Android 1.6 SDK をダウンロード &raquo;</a></p>"
+      'name':"Android 2.0",
+      'img':"eclair-android.png",
+      'title':"Android 2.0",
+      'desc': "<p>Android 2.0 の最新バージョンが公開されました。このリリースには Android 2.0 用の API、最新版デベロッパーツール、複数プラットフォーム(バージョン)サポート、そして Google API のアドオンが含まれています。</p><p><a href='{@docRoot}sdk/index.html'>Android SDK をダウンロード &raquo;</a></p>"
     },
     
     'io': {
diff --git a/docs/html/sdk/android-1.6-highlights.jd b/docs/html/sdk/android-1.6-highlights.jd
index b4a97d7e13e5d..84766d6207c9e 100644
--- a/docs/html/sdk/android-1.6-highlights.jd
+++ b/docs/html/sdk/android-1.6-highlights.jd
@@ -24,11 +24,11 @@ sdk.date=September 2009
 </style>
 
 <div class="video">
-<object width="293" height="180">
+<object width="278" height="180">
 <param name="movie" value="http://www.youtube.com/v/MBRFkLKRwFw&hl=en&fs=1&"></param>
 <param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param>
 <embed src="http://www.youtube.com/v/MBRFkLKRwFw&hl=en&fs=1&" type="application/x-shockwave-flash" 
-allowscriptaccess="always" allowfullscreen="true" width="293" height="180"></embed>
+allowscriptaccess="always" allowfullscreen="true" width="278" height="180"></embed>
 </object>
 </div>
 
diff --git a/docs/html/sdk/android-2.0-highlights.jd b/docs/html/sdk/android-2.0-highlights.jd
new file mode 100644
index 0000000000000..d4d13fcc78a76
--- /dev/null
+++ b/docs/html/sdk/android-2.0-highlights.jd
@@ -0,0 +1,201 @@
+page.title=Android 2.0 Platform Highlights
+sdk.date=October 2009
+
+@jd:body
+
+
+<style type="text/css">
+#jd-content div.screenshot,
+#jd-content div.video {
+  float:right;
+  clear:right;
+  padding:15px 60px;
+  font-size:.9em;
+  font-weight:bold;
+  line-height:1.7em;
+}
+#jd-content div.video {
+  padding-top:0;
+  margin-top:-15px;
+}
+#jd-content div.screenshot.second {
+  clear:none;
+  padding:15px 0 15px 60px;
+}
+#jd-content div.screenshot img {
+  margin:0;
+  border:1px solid #ccc;
+}
+</style>
+
+<div class="video">
+<object width="278 height="180">
+<param name="movie" value="http://www.youtube.com/v/opZ69P-0Jbc&hl=en&fs=1&"></param>
+<param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param>
+<embed src="http://www.youtube.com/v/opZ69P-0Jbc&hl=en&fs=1&" type="application/x-shockwave-flash" 
+allowscriptaccess="always" allowfullscreen="true" width="278" height="180"></embed>
+</object>
+</div>
+
+
+<p>The Android 2.0 platform introduces many new and exciting features for
+users and developers. This document provides a glimpse at some of the new features
+and technologies in Android 2.0.</p>
+
+<ul>
+  <li><a href="#UserFeatures">New User Features</a></li>
+  <li><a href="#PlatformTechnologies">New Platform Technologies</a></li>
+</ul>
+
+
+    
+<h2 id="UserFeatures" style="clear:right">New User Features</h2>
+
+<!-- screenshots float right -->
+
+<div class="screenshot">
+  <img src="images/2.0/quick-connect.png" class="screenshot" alt="" /><br/>
+  Quick Contact for Android
+</div>
+
+<div class="screenshot second">
+  <img src="images/2.0/multiple-accounts.png" class="screenshot" alt="" /><br/>
+  Multiple Accounts
+</div>
+
+<div class="screenshot">
+  <img src="images/2.0/mms-search.png" class="screenshot" alt="" /><br/>
+  Messaging Search
+</div>
+
+<div class="screenshot second">
+  <img src="images/2.0/email-inbox.png" class="screenshot" alt="" /><br/>
+  Email Combined Inbox
+</div>
+
+<div class="screenshot">
+  <img src="images/2.0/camera-modes.png" class="screenshot" alt="" /><br/>
+  Camera Modes
+</div>
+
+
+
+<h3 id="Contacts">Contacts and accounts</h3>
+
+<ul>
+  <li>Multiple accounts can be added to a device for email and contact
+synchronization, including Exchange accounts. (Handset manufacturers can
+choose whether to include Exchange support in their devices.)</li>
+  <li>Developers can create sync adapters that provide synchronization with
+additional data sources.</li>
+  <li>Quick Contact for Android provides instant access to
+a contact's information and communication modes. For example, a user can tap a
+contact photo and select to call, SMS, or email the person. Other applications
+such as Email, Messaging, and Calendar can also reveal the Quick Contact widget
+when you touch a contact photo or status icon.</li>
+</ul>
+
+
+<!--
+<ul>
+  <li>Sync support for contacts from multiple data sources including Exchange. 
+  Handset manufacturers can choose whether or not to include Exchange support 
+  in their devices.</li>
+  <li>New way to hover on a person to see more info and select communication 
+  mode (for example, phone, SMS, email).</li>
+</ul>
+-->
+
+<h3 id="Email">Email</h3>
+
+<ul>
+  <li>Exchange support.</li>
+  <li>Combined inbox to browse email from multiple accounts in one page.</li>
+</ul>
+
+
+<h3 id="Messaging">Messaging</h3>
+
+<ul>
+  <li>Search functionality for all saved SMS and MMS messages.</li>
+  <li>Auto delete the oldest messages
+  in a conversation when a defined limit is reached.</li>
+</ul>
+
+
+<h3 id="Camera">Camera</h3>
+
+<ul>
+  <li>Built-in flash support</li>
+  <li>Digital zoom</li>
+  <li>Scene mode</li>
+  <li>White balance</li>
+  <li>Color effect</li>
+  <li>Macro focus</li>
+</ul>
+
+<h3 id="Keyboard">Android virtual keyboard</h3>
+
+<ul>
+  <li>An improved keyboard layout to makes it easier to hit the correct characters
+  and improve typing speed.</li>
+  <li>The framework's multi-touch support ensures that key presses aren't missed
+  while typing rapidly with two fingers.</li>
+  <li>A smarter dictionary learns from word usage and automatically includes
+  contact names as suggestions.</li>
+</ul>
+
+
+<h3 id="Browser">Browser</h3>
+
+<ul>
+  <li>Refreshed UI with actionable browser URL bar enables users to directly 
+  tap the address bar for instant searches and navigation.</li>
+  <li>Bookmarks with web page thumbnails.</li>
+  <li>Support for double-tap zoom.</li>
+  <li>Support for HTML5:</p>
+    <ul>
+      <li>Database API support, for client-side databases using SQL.</li>
+      <li>Application cache support, for offline applications.</li>
+      <li>Geolocation API support, to provide location information about the device.</li>
+      <li>{@code &lt;video>} tag support in fullscreen mode.</li>
+    </ul>
+  </li>
+</ul>
+
+
+<h3 id="Calendar">Calendar</h3>
+<ul>
+  <li>Agenda view provides infinite scrolling.</li>
+  <li>Events indicate the attending status for each invitee.</li>
+  <li>Invite new guests to events.</li>
+</ul>
+
+
+<h2 id="PlatformTechnologies" style="clear:right">New Platform Technologies</h2>
+
+<h3 id="MediaFramework">Media Framework</h3>
+
+<p>Revamped graphics architecture for improved performance that enables better
+hardware acceleration.</p>
+
+
+<h3 id="Bluetooth">Bluetooth</h3>
+
+<ul>
+  <li>Bluetooth 2.1</li>
+  <li>New BT profiles: Object Push Profile (OPP) and Phone Book Access Profile (PBAP)</li>
+</ul>
+
+
+<h3 id="DeveloperAPIs">New Framework APIs</h3>
+
+<p>Android 2.0 includes several new developer APIs.
+For an overview of new APIs, see the 
+<a href="{@docRoot}sdk/android-2.0.html#api">Android 2.0 version notes</a>.</p>
+
+<p>For a complete report of all API changes, see the 
+<a href="{@docRoot}sdk/api_diff/5/changes.html">API Differences Report</a>.</p>
+
+
+
diff --git a/docs/html/sdk/images/2.0/camera-modes.png b/docs/html/sdk/images/2.0/camera-modes.png
new file mode 100644
index 0000000000000..ac4c1da578802
Binary files /dev/null and b/docs/html/sdk/images/2.0/camera-modes.png differ
diff --git a/docs/html/sdk/images/2.0/email-inbox.png b/docs/html/sdk/images/2.0/email-inbox.png
new file mode 100644
index 0000000000000..50d1c19033ac6
Binary files /dev/null and b/docs/html/sdk/images/2.0/email-inbox.png differ
diff --git a/docs/html/sdk/images/2.0/mms-search.png b/docs/html/sdk/images/2.0/mms-search.png
new file mode 100644
index 0000000000000..22c7dca9db2f7
Binary files /dev/null and b/docs/html/sdk/images/2.0/mms-search.png differ
diff --git a/docs/html/sdk/images/2.0/multiple-accounts.png b/docs/html/sdk/images/2.0/multiple-accounts.png
new file mode 100644
index 0000000000000..aa4cb157870d9
Binary files /dev/null and b/docs/html/sdk/images/2.0/multiple-accounts.png differ
diff --git a/docs/html/sdk/images/2.0/quick-connect.png b/docs/html/sdk/images/2.0/quick-connect.png
new file mode 100644
index 0000000000000..0bbf7dd27a659
Binary files /dev/null and b/docs/html/sdk/images/2.0/quick-connect.png differ