From cbbdefcb71143c3134c7eea454a22ed7aa193e92 Mon Sep 17 00:00:00 2001
From: Scott Main <smain@google.com>
Date: Wed, 2 Feb 2011 15:57:03 -0800
Subject: 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

Change-Id: Ibb8490b2c6bae2d9df15326c7ffbcf83b638acc6
---
 docs/html/guide/developing/device.jd | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'docs/html/guide/developing')

diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd
index 80a354f..f12c7d4 100644
--- a/docs/html/guide/developing/device.jd
+++ b/docs/html/guide/developing/device.jd
@@ -13,8 +13,8 @@ page.title=Developing on a Device
   </ol>
   <h2>See also</h2>
   <ol>
-    <li><a
-    href="{@docRoot}sdk/win-usb.html">USB Driver for Windows</a></li>
+    <li><a href="{@docRoot}sdk/win-usb.html">Google USB Driver</a></li>
+    <li><a href="{@docRoot}sdk/oem-usb.html">OEM USB Drivers</a></li>
     <li><a
 href="{@docRoot}guide/developing/eclipse-adt.html">Developing in Eclipse, with ADT</a></li>
     <li><a
@@ -73,8 +73,10 @@ would on the emulator. Before you can start, there are just a few things to do:<
   <li>Setup your system to detect your device.
     <ul>
       <li>If you're developing on Windows, you need to install a USB driver
-      for adb. See the <a href="{@docRoot}sdk/win-usb.html">Windows USB
-      Driver</a> documentation.</li>
+      for adb. If you're using an Android Developer Phone (ADP), Nexus One, or Nexus S,
+      see the <a href="{@docRoot}sdk/win-usb.html">Google Windows USB
+      Driver</a>. Otherwise, you can find a link to the appropriate OEM driver in the
+  <a href="{@docRoot}sdk/oem-usb.html">OEM USB Drivers</a> document.</li>
       <li>If you're developing on Mac OS X, it just works. Skip this step.</li>
       <li>If you're developing on Ubuntu Linux, you need to add a rules file
 that contains a USB configuration for each type of device you want to use for
-- 
cgit v1.1