diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd
index abfae5d849e0b..3127e10f3f5fb 100644
--- a/docs/html/guide/developing/device.jd
+++ b/docs/html/guide/developing/device.jd
@@ -119,7 +119,7 @@ USB device support on Linux. The USB Vendor ID is the value given to the
- | Manufacturer | USB Vendor ID |
+ Company | USB Vendor ID |
| Acer |
0502 |
@@ -132,6 +132,9 @@ USB device support on Linux. The USB Vendor ID is the value given to the
| Garmin-Asus |
091E |
+
+ | Google |
+ 18d1 |
| HTC |
0bb4 |
diff --git a/docs/html/guide/publishing/app-signing.jd b/docs/html/guide/publishing/app-signing.jd
index 93077a0aad7fe..df240e202c6b8 100644
--- a/docs/html/guide/publishing/app-signing.jd
+++ b/docs/html/guide/publishing/app-signing.jd
@@ -260,8 +260,8 @@ looks like this:
To fix this problem, simply delete the debug.keystore file.
The default storage location for AVDs is in ~/.android/ on OS X and Linux,
-in C:\Documents and Settings\\.android\ on Windows XP, and in
-C:\Users\\.android\ on Windows Vista.
+in C:\Documents and Settings\<user>\.android\ on Windows XP, and in
+C:\Users\<user>\.android\ on Windows Vista and Windows 7.
The next time you build, the build tools will regenerate a new keystore and debug key.
diff --git a/docs/html/guide/topics/resources/menu-resource.jd b/docs/html/guide/topics/resources/menu-resource.jd
index d09790bc14e86..5c1eed03fb0ad 100644
--- a/docs/html/guide/topics/resources/menu-resource.jd
+++ b/docs/html/guide/topics/resources/menu-resource.jd
@@ -250,7 +250,7 @@ on the data that is currently displayed.
android:icon="@drawable/group_item1_icon" />
<item android:id="@+id/group_item2"
android:onClick="onGroupItemClick"
- android:title="G@string/group_item2"
+ android:title="@string/group_item2"
android:icon="@drawable/group_item2_icon" />
</group>
<item android:id="@+id/submenu"
diff --git a/docs/html/guide/topics/wireless/bluetooth.jd b/docs/html/guide/topics/wireless/bluetooth.jd
index b3c768715776f..ae078b9da81ea 100644
--- a/docs/html/guide/topics/wireless/bluetooth.jd
+++ b/docs/html/guide/topics/wireless/bluetooth.jd
@@ -554,7 +554,7 @@ private class AcceptThread extends Thread {
BluetoothServerSocket tmp = null;
try {
// MY_UUID is the app's UUID string, also used by the client code
- tmp = mAdapter.listenUsingRfcommWithServiceRecord(NAME, MY_UUID);
+ tmp = mBluetoothAdapter.listenUsingRfcommWithServiceRecord(NAME, MY_UUID);
} catch (IOException e) { }
mmServerSocket = tmp;
}
@@ -690,7 +690,7 @@ private class ConnectThread extends Thread {
public void run() {
// Cancel discovery because it will slow down the connection
- mAdapter.cancelDiscovery();
+ mBluetoothAdapter.cancelDiscovery();
try {
// Connect the device through the socket. This will block
diff --git a/docs/html/resources/tutorials/hello-world.jd b/docs/html/resources/tutorials/hello-world.jd
index 020c7383ea6e8..b11770ffff878 100644
--- a/docs/html/resources/tutorials/hello-world.jd
+++ b/docs/html/resources/tutorials/hello-world.jd
@@ -433,7 +433,7 @@ The entire file should now look like this:
-Now open and modify your HelloAndroid class use the
+Now open and modify your HelloAndroid class and use the
XML layout. Edit the file to look like this:
package com.example.helloandroid;