Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread
diff --git a/docs/html/sdk/oem-usb.jd b/docs/html/sdk/oem-usb.jd
index 14015f5..e64c8d2 100644
--- a/docs/html/sdk/oem-usb.jd
+++ b/docs/html/sdk/oem-usb.jd
@@ -12,18 +12,18 @@
</div>
<p>If you are developing on Windows and would like to connect an Android-powered device
- to test your applications, then you need to install the appropriate USB driver. This document
-provides links to the web sites for several device original equipment manufacturers (OEMs),
+to test your applications, then you need to install the appropriate USB driver. This document
+provides links to the web sites for several original equipment manufacturers (OEMs),
where you can download the appropriate USB driver for your device. However, this list is
not exhaustive for all available Android-powered devices.</p>
-<p>If your device is one of the Android Developer Phones (ADP), a Nexus One, or a Nexus S,
-then you should instead use the <a href="{@docRoot}sdk/win-usb.html">Google USB Driver</a>.</p>
+<p>If you're developing on Mac OS X or Linux, then you probably don't need to install a USB driver.
+Refer to <a href="{@docRoot}guide/developing/device.html#setting-up">Setting up a Device</a> to
+start development with a device.</p>
-<p class="note"><strong>Note:</strong> If you're developing on Mac OS X or Linux, then you probably
- don't need to install a USB driver. Refer to <a
- href="{@docRoot}guide/developing/device.html#setting-up">Setting up a Device</a> to start
- development with a device.</p>
+<p class="note"><strong>Note:</strong> If your device is one of the Android Developer Phones
+(purchased from the Android Market publisher site), a Nexus One, or a Nexus S, then you should
+use the <a href="{@docRoot}sdk/win-usb.html">Google USB Driver</a>, instead of an OEM driver.</p>
<p>For instructions about how to install the driver on Windows, follow the guide for <a
href="{@docRoot}sdk/win-usb.html#InstallingDriver">Installing the USB Driver</a>.</p>
@@ -38,24 +38,44 @@
</td></tr>
<tr><td>Dell</td> <td>
- <a href="http://support.dell.com/support/downloads/index.aspx?c=us&cs=19&l=en&s=dhs&~ck=anavml">http://support.dell.com/support/downloads/index.aspx?c=us&cs=19&l=en&s=dhs&~ck=anavml</a> </td></tr>
+ <a
+href="http://support.dell.com/support/downloads/index.aspx?c=us&cs=19&l=en&s=dhs&~ck=anavml">http://
+support.dell.com/support/downloads/index.aspx?c=us&cs=19&l=en&s=dhs&~ck=anavml</a> </td></tr>
<tr><td>Foxconn</td> <td><a
href="http://drivers.cmcs.com.tw/">http://drivers.cmcs.com.tw/</a></td>
-</tr><tr><td>Garmin-Asus</td> <td><a
+</tr>
+ <tr>
+ <td>
+ Fujitsu Toshiba
+ </td>
+ <td><a
+href="http://www.fmworld.net/product/phone/sp/android/develop/">http://www.fmworld.net/product/phone/sp/android/develop/</a>
+ </td>
+ </tr>
+ <tr><td>
+ Garmin-Asus
+ </td> <td><a
href="https://www.garminasus.com/en_US/support/pcsync/">https://www.garminasus.com/en_US/support/
pcsync/</a></td>
-</tr><tr><td>HTC</td> <td><a href="http://www.htc.com ">http://www.htc.com </a> <br>Click on the
+</tr><tr><td>HTC</td> <td><a href="http://www.htc.com">http://www.htc.com </a> <br>Click on the
support tab to select your products/device. Different regions will have different links.</td>
</tr>
<tr><td>Huawei</td> <td><a
-href="http://www.huaweidevice.com/worldwide/downloadCenter.do?method=list&flay=software&directoryId=
-20&treeId=0">http://www.huaweidevice.com/worldwide/downloadCenter.do?method=list&flay=software&
+href="http://www.huaweidevice.com/worldwide/downloadCenter.do?method=list&flay=software&directoryId=20&treeId=0">http://www.huaweidevice.com/worldwide/downloadCenter.do?method=list&flay=software&
directoryId=20&treeId=0</a></td>
</tr><tr><td>KT Tech</td> <td><a
href="http://www.kttech.co.kr/cscenter/download05.asp">http://www.kttech.co.kr/cscenter/download05.
asp</a> for EV-S100(Take)</td>
-</tr><tr><td>LGE</td> <td><a
+</tr>
+ <tr>
+ <td>
+ Kyocera
+ </td>
+ <td><a href="http://www.kyocera-wireless.com/">http://www.kyocera-wireless.com/</a>
+ </td>
+ </tr>
+ <tr><td>LGE</td> <td><a
href="http://www.lg.com/us/mobile-phones/mobile-support/mobile-lg-mobile-phone-support.jsp">http://
www.lg.com/us/mobile-phones/mobile-support/mobile-lg-mobile-phone-support.jsp</a></td>
</tr><tr><td>Motorola</td> <td><a