merge in jb-release history after reset to master
diff --git a/src/source/initializing.md b/src/source/initializing.md
index 7d90f43..51f5123 100644
--- a/src/source/initializing.md
+++ b/src/source/initializing.md
@@ -67,6 +67,9 @@
$ sudo apt-get update
$ sudo apt-get install sun-java5-jdk
+*Note: The `lunch` command in the build step will ensure that the Sun JDK is
+used instead of any previously installed JDK.*
+
## Installing required packages (Ubuntu 10.04 -- 11.10) ##
Ubuntu 10.04 64-bit is recommended. Building using a newer version of Ubuntu or a 32-bit Ubuntu is
diff --git a/src/source/submit-patches.md b/src/source/submit-patches.md
index 4ad2e5c..11d3579 100644
--- a/src/source/submit-patches.md
+++ b/src/source/submit-patches.md
@@ -41,7 +41,7 @@
For each change you intend to make, start a new branch within the relevant git repository:
- $ repo start NAME
+ $ repo start NAME .
You can start several independent branches at the same time in the same repository. The branch NAME is local to your workspace and will not be included on gerrit or the final source tree.
@@ -111,7 +111,7 @@
## After a submission is approved ##
-After a submission makes it through the review and verification process, Gerrit automatically merges the change into the public repository. The change will now be visible in gitweb, and others users will be able to run `repo sync` to pull the update into their local client.
+After a submission makes it through the review and verification process, Gerrit automatically merges the change into the public repository. Other users will be able to run `repo sync` to pull the update into their local client.
# For reviewers and verifiers #
@@ -171,10 +171,6 @@
To publish your comments so that others using Gerrit will be able to see them, click the Publish Comments button. Your comments will be emailed to all relevant parties for this change, including the change owner, the patch set uploader (if different from the owner), and all current reviewers.
-## Using GitWeb to track patch histories ##
-
-To view snapshots of the files that are in the public Android repositories and view file histories, use the [Android instance of GitWeb](http://android.git.kernel.org/).
-
<a name="upstream-projects"></a>
# Upstream Projects #
diff --git a/src/source/using-eclipse.md b/src/source/using-eclipse.md
index 5af32a8..94e24cf 100644
--- a/src/source/using-eclipse.md
+++ b/src/source/using-eclipse.md
@@ -42,7 +42,7 @@
### Increase Eclipse's Memory Settings ###
-The Android project is large enough that Eclipse's Java VM sometimes runs out of memory while compiling it. Avoid this problem by editing the the `eclipse.ini` file. On Apple OSX the eclipse.ini file is located at
+The Android project is large enough that Eclipse's Java VM sometimes runs out of memory while compiling it. Avoid this problem by editing the `eclipse.ini` file. On Apple OSX the eclipse.ini file is located at
/Applications/eclipse/Eclipse.app/Contents/MacOS/eclipse.ini