am d459439f: am b8ab347b: am 81800015: am fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo

docs/html/guide/developing/tools/emulator.jd

@@ -1142,7 +1142,7 @@ currently supported.</p>
 emulator checks the value of the <code>http_proxy</code> environment variable at
 startup and uses its value automatically, if defined. </p>
 
-<p>You can use the <code>-verbose-proxy</code> option to diagnose proxy
+<p>You can use the <code>-debug-proxy</code> option to diagnose proxy
 connection problems.</p>
 
 <a name="connecting"></a>

docs/html/guide/practices/design/performance.jd

@@ -279,7 +279,7 @@ address some of them here.</p>
 <p>On devices without a JIT, it is true that invoking methods via a
 variable with an exact type rather than an interface is slightly more
 efficient. (So, for example, it was cheaper to invoke methods on a
-<code>Map map</code> than a <code>HashMap map</code>, even though in both
+<code>HashMap map</code> than a <code>Map map</code>, even though in both
 cases the map was a <code>HashMap</code>.) It was not the case that this
 was 2x slower; the actual difference was more like 6% slower. Furthermore,
 the JIT makes the two effectively indistinguishable.</p>

docs/html/guide/topics/providers/content-providers.jd

@@ -176,17 +176,7 @@ people (both controlled by the Contacts content provider) are:
 <p>
 <p style="margin-left: 2em">{@code android.provider.Contacts.Phones.CONTENT_URI}
 <br/>{@code android.provider.Contacts.Photos.CONTENT_URI}
-</p>   
-
-<p>
-Similarly, the URIs for the table of recent phone calls and the table 
-of calendar entries are:
-</p>   
-
-<p>
-<p style="margin-left: 2em">{@code android.provider.CallLog.Calls.CONTENT_URI}
-<br/>{@code android.provider.Calendar.CONTENT_URI}
-</p>   
+</p>
 
 <p>
 The URI constant is used in all interactions with the content provider. 

docs/html/sdk/adt_download.jd

@@ -22,11 +22,18 @@ ADT Installation</a>.</p>
     <th>Notes</th>
   </tr>
   <tr>
-     <td>0.9.6</td>
-     <td><a href="http://dl-ssl.google.com/android/ADT-0.9.6.zip">ADT-0.9.6.zip</a></td>
+     <td>0.9.7</td>
+     <td><a href="http://dl-ssl.google.com/android/ADT-0.9.7.zip">ADT-0.9.7.zip</a></td>
      <td><nobr>{@adtZipBytes} bytes</nobr></td>
      <td>{@adtZipChecksum}</td>
-     <td>Requires SDK Tools, Revision 5 <em><nobr>March 2009</nobr></em></td>
+     <td>Requires SDK Tools, Revision 6 <em><nobr>May 2010</nobr></em></td>
+  </tr>
+  <tr>
+     <td>0.9.6</td>
+     <td><a href="http://dl-ssl.google.com/android/ADT-0.9.6.zip">ADT-0.9.6.zip</a></td>
+     <td><nobr>7456339 bytes</nobr></td>
+     <td>ea45d271be52b87b5dd1c9fb17536223</td>
+     <td>Requires SDK Tools, Revision 5 <em><nobr>March 2010</nobr></em></td>
   </tr>
   <tr>
      <td>0.9.5</td>