diff --git a/docs/html/guide/appendix/api-levels.jd b/docs/html/guide/appendix/api-levels.jd
index b3b6371..0830032 100644
--- a/docs/html/guide/appendix/api-levels.jd
+++ b/docs/html/guide/appendix/api-levels.jd
@@ -324,22 +324,24 @@
 accessible to your application, based on the API Level that it specifies in 
 the <code>android:minSdkVersion</code> attribute of its manifest file. </p>
 
-<p>To use filtering, set the control to the same API Level as that specified
-by your application. Notice that APIs introduced in a later API Level are 
-then grayed out and their content is masked, since they would not be
-accessible to your application. </p>
+<p>To use filtering, select the checkbox to enable filtering, just below the
+page search box. Then set the "Filter by API Level" control to the same API
+Level as specified by your application. Notice that APIs introduced in a later
+API Level are then grayed out and their content is masked, since they would not
+be accessible to your application. </p>
 
 <p>Filtering by API Level in the documentation does not provide a view
 of what is new or introduced in each API Level &mdash; it simply provides a way
 to view the entire API associated with a given API Level, while excluding API
 elements introduced in later API Levels.</p>
 
-<p>By default, API Level filtering is enabled and set to show the latest API
-Level. If you do not want to use filtering reference documentation, 
-simply select the highest available API Level. </p>
+<p>If you decide that you don't want to filter the API documentation, just
+disable the feature using the checkbox. By default, API Level filtering is
+disabled, so that you can view the full framework API, regardless of API Level.
+</p>
 
 <p>Also note that the reference documentation for individual API elements
-specifies the API Level at which the elements were introduced. The API Level 
+specifies the API Level at which each element was introduced. The API Level 
 for packages and classes is specified as "Since &lt;api level&gt;" at the 
 top-right corner of the content area on each documentation page. The API Level 
 for class members is specified in their detailed description headers, 
diff --git a/docs/html/guide/practices/screens_support.jd b/docs/html/guide/practices/screens_support.jd
index 1d16d88..88975f8 100644
--- a/docs/html/guide/practices/screens_support.jd
+++ b/docs/html/guide/practices/screens_support.jd
@@ -1069,29 +1069,30 @@
 various screen sizes, you should make sure to add the corresponding size
 attribute(s) to your application's manifest. -->
 
+<div id="f9.5" style="float:right;margin:0;padding:0;">
+  <img src="{@docRoot}images/screens_support/avds-config.png" style="padding:0;margin:0;">
+  <p class="caption" style="margin:0 0 1.5em 1em;padding:0 0 0 1em;"><strong>Figure 3.</strong>
+  A typical set of AVDs for testing screens support.</p>
+</div>
+
 <p>As a test environment for your applications, set up a series of AVDs that
 emulate the screen sizes and densities you want to support. The Android SDK
-includes four emulator skins to get you started. You can use the Android AVD
+includes six emulator skins to get you started. You can use the Android AVD
 Manager or the <code>android</code> tool to create AVDs that use the various
 emulator skins and you can also set up custom AVDs to test densities other than
 the defaults. For general information about working with AVDs, see 
 <a href="{@docRoot}guide/developing/tools/avd.html">Android Virtual
 Devices</a>.</p>
 
-<p>The Android 1.6 and higher platforms in the SDK include these emulator skins,
-which represent the primary screen configurations that your should test:</p>
+<p>The Android SDK provides a set of default emulator skins that you can use for 
+testing. The skins are included as part of each Android platform that you can
+install in your SDK. The Android 1.6 platform offers these default skins:</p>
 
 <ul>
   <li>
     QVGA (240x320, low density, small screen)
   </li>
   <li>
-    WQVGA400 (240x400, low density, normal screen)
-  </li>
-  <li>
-    WQVGA432 (240x432, low density, normal screen)
-  </li>
-  <li>
     HVGA (320x480, medium density, normal screen)
   </li>
   <li>
@@ -1102,6 +1103,18 @@
   </li>
 </ul>
 
+<p>The Android 2.0 platform offers all of the Android 1.6 default skins, 
+above, plus:</p>
+
+<ul>
+  <li>
+    WQVGA400 (240x400, low density, normal screen)
+  </li>
+  <li>
+    WQVGA432 (240x432, low density, normal screen)
+  </li>
+</ul>
+
 <p>If you are using the <code>android</code> tool command line to create your
 AVDs, here's an example of how to specify the skin you want to use:</p>
 
@@ -1131,6 +1144,12 @@
     QVGA, low density: 3.3"
   </li>
   <li>
+    WQVGA, low density: 3.9"
+  </li>
+  <li>
+    WQVGA432, low density: 4.1"
+  </li>
+  <li>
     HVGA, medium density: 3.6"
   </li>
   <li>
@@ -1141,6 +1160,12 @@
   </li>
 </ul>
 
+<div style="float: right;background-color:#fff;margin: 0;padding: 20px 0 20px 20px;width:520px;">
+  <img src="{@docRoot}images/screens_support/avd-density.png" style="padding:0;margin:0;">
+  <p class="caption" style="margin:0 0 1.5em 1em;padding:0 0 0 1em; width:280px;"><strong>Figure 4.</strong>
+  Resolution and density options that you can use, when creating an AVD using the AVD Manager.</p>
+</div>
+
 <p>You should also make sure to test your application on different physical
 screen sizes within a single size-density configuration. For example, according
 to <a href="#range">Table 1</a>, the minimum supported diagonal of QVGA is 2.8".
@@ -1150,21 +1175,35 @@
 
 <pre>emulator -avd &lt;name&gt; -scale 0.6</pre>
 
-<p>If you would like to test your application on a screen not supported by the
-built-in skins, you can either adjust an existing skin, or create a custom
-resolution.</p>
+<p>If you would like to test your application on a screen that uses a resolution
+or density not supported by the built-in skins, you can either adjust an
+existing skin, or create an AVD
+that uses a custom resolution or density.</p>
 
-<p>For example, to test on a large WVGA800 screen with medium density:</p>
+<p>In the AVD Manager, you can specify a custom skin resolution or density in
+the Create New AVD dialog, as shown in Figure 4, at right.</p>
+
+<p>In the <code>android</code> tool, follow these steps to create an AVD with a
+custom resolution or density:</p>
 
 <ol>
-  <li>Create an AVD based on the WVGA800 skin (using the <code>android</code>
-tool's command line.)<br></li>
-  <li>Answer "yes" when asked about using custom hardware</li>
-  <li>enter "160" when asked about the value for <em>hw.lcd.density</em>
-(120-low, 160-medium, 240-high).</li>
+  <li>Use the <code>create avd</code> command to create a new AVD, specifying
+the <code>--skin</code> option with a value that references either a default
+skin name (such as "WVGA800") or a custom skin resolution (such as 240x432).
+Here's an example:
+     <pre>android create avd -n &lt;name&gt; -t &lt;targetID&gt; --skin WVGA800</pre>
+  </li>
+  <li>To specify a custom density for the skin, answer "yes" when asked whether
+you want to create a custom hardware profile for the new AVD.</li>
+  <li>Continue through the various profile settings until the tool asks you to
+specify "Abstracted LCD density" (<em>hw.lcd.density</em>). Consult <a
+href="#range">Table 1</a>, earlier in this document, and enter the appropriate
+value. For example, enter "160" to use medium density for the WVGA800 screen.</li>
+  <li>Set any other hardware options and complete the AVD creation.</li>
 </ol>
 
-<p>When running this AVD, the emulator will emulate a 5.8" WVGA screen.</p>
+<p>In the example above (WVGA medium density), the new AVD will emulate a 5.8" 
+WVGA screen.</p>
 
 <p>As an alternative to adjusting the emulator skin configuration, you can use
 the emulator skin's default density and add the <code>-dpi-device</code> option
@@ -1172,25 +1211,6 @@
 
 <pre>emulator -avd WVGA800 -scale 96dpi -dpi-device 160</pre>
 
-<p>If you would like to test your application with a resolution not supported by
-the provided skins, you can use the desired resolution in place of the skin
-name. For instance, for FWQVGA you would use:</p>
-
-<pre>android create avd ... --skin 240x432</pre>
-
-<p>Next, you would need to set the proper density for the screen. When asked by
-the tool whether you want to create a custom hardware profile for the new AVD,
-enter "yes". Continue through the various profile settings until the tools asks
-you to specify "Abstracted LCD density". Consult <a href="#range">Table 1</a>,
-earlier in this document, and enter the appropriate value. For the FWQVGA
-screen, the density should be "160", or medium.</p>
-
-<div id="f9.5" style="text-align:left;margin:0;padding:0;">
-  <img src="{@docRoot}images/screens_support/avds-config.png" style="padding:0;margin:0;">
-  <p class="caption" style="margin:0 0 1.5em 1em;padding:0 0 0 1em;"><strong>Figure 3.</strong>
-  A typical set of AVDs for testing screens support.</p>
-</div>
-
 
 <h2 id="compatibility-examples">Screen-Compatibility Examples</h2>
 
diff --git a/docs/html/images/screens_support/avd-density.png b/docs/html/images/screens_support/avd-density.png
new file mode 100644
index 0000000..e3fc36e
--- /dev/null
+++ b/docs/html/images/screens_support/avd-density.png
Binary files differ
diff --git a/docs/html/sdk/android-1.5.jd b/docs/html/sdk/android-1.5.jd
index 15d1938..4612682 100644
--- a/docs/html/sdk/android-1.5.jd
+++ b/docs/html/sdk/android-1.5.jd
@@ -16,7 +16,6 @@
 	<li><a href="#apps">Built-in Applications</a></li>
 	<li><a href="#locs">Locales</a></li>
 	<li><a href="#skins">Emulator Skins</a></li>
-	<li><a href="#notes">Other Notes</a></li>
 	<li><a href="#api">Framework API</a>
         <ol>
 	<li><a href="#api-level">API level</a></li>
diff --git a/docs/html/sdk/android-1.6.jd b/docs/html/sdk/android-1.6.jd
index 38112b5..4b659a1a 100644
--- a/docs/html/sdk/android-1.6.jd
+++ b/docs/html/sdk/android-1.6.jd
@@ -16,7 +16,6 @@
 	<li><a href="#apps">Built-in Applications</a></li>
 	<li><a href="#locs">Locales</a></li>
 	<li><a href="#skins">Emulator Skins</a></li>
-	<li><a href="#notes">Other Notes</a></li>
 	<li><a href="#api">Framework API</a>
         <ol>
 	<li><a href="#api-level">API level</a></li>
diff --git a/docs/html/sdk/api_diff/3/changes.html b/docs/html/sdk/api_diff/3/changes.html
index bc0f879..9bc67b9 100644
--- a/docs/html/sdk/api_diff/3/changes.html
+++ b/docs/html/sdk/api_diff/3/changes.html
@@ -26,12 +26,12 @@
 body{background-image:url();padding:12px;}
 </style>
 </head>
-<FRAMESET COLS="242,**" frameborder="1" border="7" bordercolor="#e9e9e9"> 
-<frameset rows="164,**" frameborder="1" border="7" resizable="yes">
-    <FRAME SRC="changes/jdiff_topleftframe.html" SCROLLING="no" NAME="topleftframe">
-    <FRAME SRC="changes/alldiffs_index_all.html" SCROLLING="auto" NAME="bottomleftframe">
+<FRAMESET COLS="242,**" framespacing="1" frameborder="yes" border="1" bordercolor="#e9e9e9">
+<frameset rows="174,**" framespacing="1" frameborder="yes"  border="1" bordercolor="#e9e9e9">
+    <FRAME SRC="changes/jdiff_topleftframe.html" SCROLLING="no" NAME="topleftframe" frameborder="1">
+    <FRAME SRC="changes/alldiffs_index_all.html" SCROLLING="auto" NAME="bottomleftframe" frameborder="1">
   </FRAMESET>
-  <FRAME SRC="changes/changes-summary.html" SCROLLING="auto" NAME="rightframe">
+  <FRAME SRC="changes/changes-summary.html" SCROLLING="auto" NAME="rightframe" frameborder="1">
 </FRAMESET>
 <NOFRAMES>
 <H2>
diff --git a/docs/html/sdk/api_diff/3/stylesheet-jdiff.css b/docs/html/sdk/api_diff/3/stylesheet-jdiff.css
index b3c1b9a..abc4dd5 100644
--- a/docs/html/sdk/api_diff/3/stylesheet-jdiff.css
+++ b/docs/html/sdk/api_diff/3/stylesheet-jdiff.css
@@ -3,6 +3,7 @@
 
 div.and-diff-id {border: 1px solid #eee;position:relative;float:right;clear:both;padding:0px;}
 table.diffspectable {border:1px;padding:0px;margin:0px;}
+table.jdiffIndex {margin-bottom:.5em;}
 .diffspechead {background-color:#eee;}
 .diffspectable tr {border:0px;padding:0px;}
 .diffspectable td  {background-color:eee;border:0px;font-size:90%;font-weight:normal;padding:0px;padding-left:1px;padding-right:1px;text-align:center;color:777;}
@@ -29,7 +30,7 @@
   }
 .hiddenlink {
   font-size:96%;
-  line-height:.8em;
+/*  line-height:.8em; */
   text-decoration:none;}
 a {
   text-decoration:none;}
diff --git a/docs/html/sdk/api_diff/4/changes.html b/docs/html/sdk/api_diff/4/changes.html
index c1b66a1..9cfdc24 100644
--- a/docs/html/sdk/api_diff/4/changes.html
+++ b/docs/html/sdk/api_diff/4/changes.html
@@ -25,12 +25,12 @@
 <style type="text/css">
 </style>
 </HEAD>
-<FRAMESET COLS="242,**" frameborder="1" border="7" xframespacing="20" bordercolor="#e9e9e9"> 
-<frameset rows="164,**" frameborder="1" border="7" xframespacing="20" resizable="yes">
-    <FRAME SRC="changes/jdiff_topleftframe.html" SCROLLING="no" NAME="topleftframe" xframeborder="1" xborder="6" xframespacing="0">
-    <FRAME SRC="changes/alldiffs_index_all.html" SCROLLING="auto" NAME="bottomleftframe" xframeborder="1" xborder="1" xframespacing="0">
+<FRAMESET COLS="242,**" framespacing="1" frameborder="yes" border="1" bordercolor="#e9e9e9">
+<frameset rows="174,**" framespacing="1" frameborder="yes"  border="1" bordercolor="#e9e9e9">
+    <FRAME SRC="changes/jdiff_topleftframe.html" SCROLLING="no" NAME="topleftframe" frameborder="1">
+    <FRAME SRC="changes/alldiffs_index_all.html" SCROLLING="auto" NAME="bottomleftframe" frameborder="1">
   </FRAMESET>
-  <FRAME SRC="changes/changes-summary.html" SCROLLING="auto" NAME="rightframe" xframeborder="1" xborder="1" xframespacing="0">
+  <FRAME SRC="changes/changes-summary.html" SCROLLING="auto" NAME="rightframe" frameborder="1">
 </FRAMESET>
 <NOFRAMES>
 <H2>
diff --git a/docs/html/sdk/api_diff/4/stylesheet-jdiff.css b/docs/html/sdk/api_diff/4/stylesheet-jdiff.css
index b3c1b9a..824b3df 100644
--- a/docs/html/sdk/api_diff/4/stylesheet-jdiff.css
+++ b/docs/html/sdk/api_diff/4/stylesheet-jdiff.css
@@ -3,6 +3,7 @@
 
 div.and-diff-id {border: 1px solid #eee;position:relative;float:right;clear:both;padding:0px;}
 table.diffspectable {border:1px;padding:0px;margin:0px;}
+table.jdiffIndex {margin-bottom:.5em;}
 .diffspechead {background-color:#eee;}
 .diffspectable tr {border:0px;padding:0px;}
 .diffspectable td  {background-color:eee;border:0px;font-size:90%;font-weight:normal;padding:0px;padding-left:1px;padding-right:1px;text-align:center;color:777;}
@@ -29,7 +30,7 @@
   }
 .hiddenlink {
   font-size:96%;
-  line-height:.8em;
+/* line-height:.8em; */
   text-decoration:none;}
 a {
   text-decoration:none;}
diff --git a/docs/html/sdk/api_diff/5/changes.html b/docs/html/sdk/api_diff/5/changes.html
index dc3f7cb..671e890 100644
--- a/docs/html/sdk/api_diff/5/changes.html
+++ b/docs/html/sdk/api_diff/5/changes.html
@@ -25,12 +25,12 @@
 <style type="text/css">
 </style>
 </HEAD>
-<FRAMESET COLS="242,**" frameborder="1" border="7" xframespacing="20" bordercolor="#e9e9e9"> 
-<frameset rows="164,**" frameborder="1" border="7" xframespacing="20" resizable="yes">
-    <FRAME SRC="changes/jdiff_topleftframe.html" SCROLLING="no" NAME="topleftframe" xframeborder="1" xborder="6" xframespacing="0">
-    <FRAME SRC="changes/alldiffs_index_all.html" SCROLLING="auto" NAME="bottomleftframe" xframeborder="1" xborder="1" xframespacing="0">
+<FRAMESET COLS="242,**" framespacing="1" frameborder="yes" border="1" bordercolor="#e9e9e9">
+<frameset rows="174,**" framespacing="1" frameborder="yes"  border="1" bordercolor="#e9e9e9">
+    <FRAME SRC="changes/jdiff_topleftframe.html" SCROLLING="no" NAME="topleftframe" frameborder="1">
+    <FRAME SRC="changes/alldiffs_index_all.html" SCROLLING="auto" NAME="bottomleftframe" frameborder="1">
   </FRAMESET>
-  <FRAME SRC="changes/changes-summary.html" SCROLLING="auto" NAME="rightframe" xframeborder="1" xborder="1" xframespacing="0">
+  <FRAME SRC="changes/changes-summary.html" SCROLLING="auto" NAME="rightframe" frameborder="1">
 </FRAMESET>
 <NOFRAMES>
 <H2>
diff --git a/docs/html/sdk/api_diff/5/stylesheet-jdiff.css b/docs/html/sdk/api_diff/5/stylesheet-jdiff.css
index b3c1b9a..abc4dd5 100644
--- a/docs/html/sdk/api_diff/5/stylesheet-jdiff.css
+++ b/docs/html/sdk/api_diff/5/stylesheet-jdiff.css
@@ -3,6 +3,7 @@
 
 div.and-diff-id {border: 1px solid #eee;position:relative;float:right;clear:both;padding:0px;}
 table.diffspectable {border:1px;padding:0px;margin:0px;}
+table.jdiffIndex {margin-bottom:.5em;}
 .diffspechead {background-color:#eee;}
 .diffspectable tr {border:0px;padding:0px;}
 .diffspectable td  {background-color:eee;border:0px;font-size:90%;font-weight:normal;padding:0px;padding-left:1px;padding-right:1px;text-align:center;color:777;}
@@ -29,7 +30,7 @@
   }
 .hiddenlink {
   font-size:96%;
-  line-height:.8em;
+/*  line-height:.8em; */
   text-decoration:none;}
 a {
   text-decoration:none;}