Merge changes I81efc9a1,I18e94f3e,If5d0a3dc

* changes:
  Document build issues on Ubuntu 11.10
  Document build issues with XCode 4.3
  Document 4.0.x build issues on MacOS 10.7
diff --git a/src/source/build-numbers.md b/src/source/build-numbers.md
index 1e782b7..b0d581b 100644
--- a/src/source/build-numbers.md
+++ b/src/source/build-numbers.md
@@ -111,7 +111,8 @@
 IML74K | android-4.0.3_r1   | Nexus S
 IML77  | android-4.0.3_r1.1 |
 IMM76  | android-4.0.4_r1   |
-IMM76D | android-4.0.4_r1.1 | Nexus S, latest IceCreamSandwich version
+IMM76D | android-4.0.4_r1.1 | Nexus S, Nexus S 4G, Galaxy Nexus
+IMM76I | android-4.0.4_r1.2 | Galaxy Nexus, latest IceCreamSandwich version
 
 The branches froyo, gingerbread, ics-mr0, ics-mr1, represent development
 branches that do not exactly match configurations that were tested
@@ -137,7 +138,8 @@
 HTK75D | android-3.2.1_r2
 HLK75C | android-3.2.2_r1
 HLK75D | android-3.2.2_r2
-HLK75F | android-3.2.4_r1   | latest Honeycomb version
+HLK75F | android-3.2.4_r1
+HLK75H | android-3.2.6_r1   | latest Honeycomb version
 
 There is no manifest that contains exactly those. However, there
 are manifests that allow building those components. The following
diff --git a/src/source/building-devices.md b/src/source/building-devices.md
index b0ee88c..bf3132a 100644
--- a/src/source/building-devices.md
+++ b/src/source/building-devices.md
@@ -23,7 +23,7 @@
 Xoom, and Nexus S.
 
 Galaxy Nexus is supported only in GSM/HSPA+ configuration "maguro" and only
-if it was originally sold with a "yakju" operating system.
+if it was originally sold with a "yakju" or "takju" operating system.
 
 The Motorola Xoom is supported in the Wi-fi configuration "wingray"
 sold in the USA.
@@ -110,9 +110,13 @@
 
 Official binaries for Nexus S, Galaxy Nexus, and PandaBoard can be
 downloaded from
-[Google's Nexus driver page](https://code.google.com/android/nexus/drivers.html),
+[Google's Nexus driver page](https://developers.google.com/android/nexus/drivers),
 which add access to additional hardware capabilities with non-Open-Source code.
 
+When a device is suppoted in the master branch, the binaries for the most
+recent numbered release are the ones that should be used in the master
+branch.
+
 There are no official binaries for Nexus One, ADP2 or ADP1.
 
 ### Extracting the proprietary binaries ###
@@ -139,15 +143,15 @@
 The recommended builds for the various devices are available through
 the lunch menu, accessed when running the `lunch` command with no arguments:
 
-Device   | Branch             | Build configuration
----------|--------------------|------------------------
-maguro   | android-4.0.4_r1.1 | full_maguro-userdebug
-panda    | master             | full_panda-userdebug
-wingray  | android-4.0.4_r1.1 | full_wingray-userdebug
-crespo   | android-4.0.4_r1.1 | full_crespo-userdebug
-passion  | android-2.3.7_r1   | full_passion-userdebug
-sapphire | android-2.2.3_r1   | full_sapphire-userdebug
-dream    | android-2.2.3_r1   | full_dream-userdebug
+Device   | Branch                       | Build configuration
+---------|------------------------------|------------------------
+maguro   | android-4.0.4_r1.2 or master | full_maguro-userdebug
+panda    | master                       | full_panda-userdebug
+wingray  | android-4.0.4_r1.2 or master | full_wingray-userdebug
+crespo   | android-4.0.4_r1.2 or master | full_crespo-userdebug
+passion  | android-2.3.7_r1             | full_passion-userdebug
+sapphire | android-2.2.3_r1             | full_sapphire-userdebug
+dream    | android-2.2.3_r1             | full_dream-userdebug
 
 ## Flashing a device ##
 
@@ -187,7 +191,7 @@
 However, no compatibility issues are expected when running newer systems
 with older bootloaders and radio images according to the following tables.
 
-Nexus S (worldwide version "XX"):
+Nexus S (worldwide version "XX", i9020t and i9023):
 
 Android Version | Preferred Bootloader | Preferred Radio | Also possible
 ----------------|----------------------|-----------------|--------------
@@ -200,8 +204,9 @@
 2.3.6 (GRK39F)  | I9020XXKA3           | I9020XXKF1      | All previous versions
 4.0.3 (IML74K)  | I9020XXKL1           | I9020XXKI1      | All previous versions
 4.0.4 (IMM76D)  | I9020XXKL1           | I9020XXKI1
+4.0.4 (IMM76I)  | I9020XXKL1           | I9020XXKI1
 
-Nexus S (850MHz version "UC"):
+Nexus S (850MHz version "UC", i9020a):
 
 Android Version | Preferred Bootloader | Preferred Radio | Also possible
 ----------------|----------------------|-----------------|--------------
@@ -211,9 +216,10 @@
 2.3.6 (GRK39C)  | I9020XXKA3           | I9020UCKF1      | All previous versions
 2.3.6 (GRK39F)  | I9020XXKA3           | I9020UCKF1      | All previous versions
 4.0.3 (IML74K)  | I9020XXKL1           | I9020UCKF1      | All previous versions
-4.0.4 (IMM76D)  | I9020XXKL1           | I9020UCKJ1      | All previous versions
+4.0.4 (IMM76D)  | I9020XXKL1           | I9020UCKJ1
+4.0.4 (IMM76I)  | I9020XXKL1           | I9020UCKJ1
 
-Nexus S (Korea version "KR"):
+Nexus S (Korea version "KR", m200):
 
 Android Version | Preferred Bootloader | Preferred Radio | Also possible
 ----------------|----------------------|-----------------|--------------
@@ -222,7 +228,8 @@
 2.3.5 (GRJ90)   | I9020XXKA3           | M200KRKC1       | All previous versions
 2.3.6 (GRK39F)  | I9020XXKA3           | M200KRKC1       | All previous versions
 4.0.3 (IML74K)  | I9020XXKL1           | M200KRKC1       | All previous versions
-4.0.4 (IMM76D)  | I9020XXKL1           | M200KRKC1       | All previous versions
+4.0.4 (IMM76D)  | I9020XXKL1           | M200KRKC1       | Versions from 2.3.6
+4.0.4 (IMM76I)  | I9020XXKL1           | M200KRKC1       | Versions from 2.3.6
 
 Galaxy Nexus (GSM/HSPA+):
 
@@ -231,7 +238,8 @@
 4.0.1 (ITL41D)  | PRIMEKJ10            | I9250XXKK1
 4.0.2 (ICL53F)  | PRIMEKK15            | I9250XXKK6      | All previous versions
 4.0.3 (IML74K)  | PRIMEKL01            | I9250XXKK6      | All previous versions
-4.0.4 (IMM76D)  | PRIMEKL03            | I9250XXLA02     | Versions from 4.0.2
+4.0.4 (IMM76D)  | PRIMEKL03            | I9250XXLA02
+4.0.4 (IMM76I)  | PRIMEKL03            | I9250XXLA02
 
 If you're building a new version of Android, if your Nexus S or
 Galaxy Nexus has
@@ -244,11 +252,11 @@
 ## Restoring a device to its original factory state ##
 
 Factory images
-for Galaxy Nexus (GSM/HSPA+ "yakju" and CDMA/LTE "mysid")
+for Galaxy Nexus (GSM/HSPA+ "yakju" and "takju", and CDMA/LTE "mysid")
 and
 for Nexus S (all variants)
 are available from
-[Google's factory image page](https://code.google.com/android/nexus/images.html).
+[Google's factory image page](https://developers.google.com/android/nexus/images).
 
 Factory images for the Motorola Xoom are distributed directly by Motorola.
 
diff --git a/src/source/downloading.md b/src/source/downloading.md
index f039591..d76e86c 100644
--- a/src/source/downloading.md
+++ b/src/source/downloading.md
@@ -32,7 +32,11 @@
         $ curl https://dl-ssl.google.com/dl/googlesource/git-repo/repo > ~/bin/repo
         $ chmod a+x ~/bin/repo
 
- - The SHA-1 checksum for repo is 29ba4221d4fccdfa8d87931cd73466fdc24040b5
+ - For version 1.15, the SHA-1 checksum for repo is
+ 8eb56d98b36d615c3efec51868e87bebe757feb1
+
+ - For version 1.16, the SHA-1 checksum for repo is
+ f3bfa7fd2d0a44aa40579bb0242cc20df37b5e17
 
 
 ## Initializing a Repo client ##