commit 272a1d37d4a0633084dc04c48c137be8606f1770
author Brian Muramatsu <btmura@google.com> Wed Jun 08 15:21:29 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 08 15:21:29 2011 -0700
tree c8f1987598c645b05ce5e160f0b48cb097177944
parent f5e108fb7197ab5108f31d60dff23ad18d9fd251
parent 5f91d71967e993edf1c56559b7a814ef3b247ba0

Merge "Fix GB CTS Text / Update Link for Froyo CTS"

src/source/building-devices.md

diff --git a/src/source/building-devices.md b/src/source/building-devices.md
index fd7bed7..6fda907 100644
--- a/src/source/building-devices.md
+++ b/src/source/building-devices.md
@@ -115,13 +115,13 @@
 The recommended builds for the various devices are available through
 the lunch menu, accesed when running the `lunch` command with no arguments:
 
-Device   | Build configuration
----------|---------------------
-crespo   | full_crespo-userdebug
-crespo4g | full_crespo4g-userdebug
-passion  | full_passion-userdebug
-sapphire | full_sapphire-userdebug
-dream    | full_dream-userdebug
+Device   | Branch           | Build configuration
+---------|------------------|------------------------
+crespo   | android-2.3.4_r1 | full_crespo-userdebug
+crespo4g | gingerbread      | full_crespo4g-userdebug
+passion  | android-2.3.4_r1 | full_passion-userdebug
+sapphire | android-2.2.2_r1 | full_sapphire-userdebug
+dream    | android-2.2.2_r1 | full_dream-userdebug
 
 ## Flashing a device ##
 

src/source/downloading.md

diff --git a/src/source/downloading.md b/src/source/downloading.md
index b096248..d932efa 100644
--- a/src/source/downloading.md
+++ b/src/source/downloading.md
@@ -75,6 +75,7 @@
 
     -----BEGIN PGP PUBLIC KEY BLOCK-----
     Version: GnuPG v1.4.2.2 (GNU/Linux)
+
     mQGiBEnnWD4RBACt9/h4v9xnnGDou13y3dvOx6/t43LPPIxeJ8eX9WB+8LLuROSV
     lFhpHawsVAcFlmi7f7jdSRF+OvtZL9ShPKdLfwBJMNkU66/TZmPewS4m782ndtw7
     8tR1cXb197Ob8kOfQB3A9yk2XZ4ei4ZC3i6wVdqHLRxABdncwu5hOF9KXwCgkxMD

src/source/initializing.md

diff --git a/src/source/initializing.md b/src/source/initializing.md
index 6f1bd80..074daa8 100644
--- a/src/source/initializing.md
+++ b/src/source/initializing.md
@@ -66,9 +66,10 @@
 
 To set up your development environment, install the following required packages:
 
-    $ sudo apt-get install git-core gnupg flex bison gperf build-essential zip curl zlib1g-dev libc6-dev
-      lib32ncurses5-dev ia32-libs x11proto-core-dev libx11-dev lib32readline5-dev lib32z-dev libgl1-mesa-dev
-      g++-multilib
+    $ sudo apt-get install git-core gnupg flex bison gperf build-essential \
+      zip curl zlib1g-dev libc6-dev lib32ncurses5-dev ia32-libs \
+      x11proto-core-dev libx11-dev lib32readline5-dev lib32z-dev \
+      libgl1-mesa-dev g++-multilib
 
 ## Configuring USB Access ##