Changes for 4.2.1

Also document the kernels better, and fine-tune the details about N7 support.

Bug: 4445289
Change-Id: I72658c600174cfbe02be54e5bdbbede01cd72d64
diff --git a/src/source/build-numbers.md b/src/source/build-numbers.md
index d41700d..9a248dd 100644
--- a/src/source/build-numbers.md
+++ b/src/source/build-numbers.md
@@ -43,7 +43,7 @@
 Ice Cream Sandwich | 4.0.1 - 4.0.2 | API level 14, NDK 7
 Ice Cream Sandwich | 4.0.3 - 4.0.4 | API level 15, NDK 8
 Jelly Bean       | 4.1.x         | API level 16
-Jelly Bean       | 4.2           | API level 17
+Jelly Bean       | 4.2.x         | API level 17
 
 Starting with Cupcake, individual builds are identified with a short
 build code, e.g. FRF85B.
@@ -126,7 +126,8 @@
 JRO03R | android-4.1.1_r6   | Nexus S 4G
 JRO03S | android-4.1.1_r6.1 | Nexus 7
 JZO54K | android-4.1.2_r1   | Nexus S, Galaxy Nexus, Nexus 7
-JOP40C | android-4.2_r1     | latest Jelly Bean version, Galaxy Nexus, Nexus 7, Nexys 4, Nexus 10
+JOP40C | android-4.2_r1     | Galaxy Nexus, Nexus 7, Nexus 4, Nexus 10
+JOP40D | android-4.2.1_r1   | latest Jelly Bean version, Galaxy Nexus, Nexus 7, Nexus 4, Nexus 10
 
 The branches froyo, gingerbread, ics-mr0, ics-mr1, jb-dev,
 jb-mr1-dev,
diff --git a/src/source/building-devices.md b/src/source/building-devices.md
index df3d719..18055ba 100644
--- a/src/source/building-devices.md
+++ b/src/source/building-devices.md
@@ -20,7 +20,7 @@
 information that is specific to individual devices.
 
 With the current release, it is possible to build for
-Nexus 10, for Nexus 7, and for some variants of Galaxy Nexus.
+Nexus 10, for Nexus 7 (Wi-Fi), and for some variants of Galaxy Nexus.
 The exact level of functionality for each device depends on the availability
 of the relevant proprietary hardware-specific binaries.
 
@@ -32,7 +32,7 @@
 The Wi-Fi variants of Nexus 7 can be used. On Nexus 7, graphics and audio are
 functional, as well as Wi-Fi and Bluetooth. Due to hardware differences, do
 not use 4.1.1 on a Nexus 7 that was originally sold with 4.1.2 or newer.
-The 3G variant is not supported.
+The Mobile variant is not supported.
 
 The variants of Galaxy Nexus that can be used are the GSM/HSPA+ configuration
 "maguro" (only if it was originally sold with a "yakju" or "takju" operating
@@ -167,11 +167,11 @@
 
 Device   | Branch                       | Build configuration
 ---------|------------------------------|------------------------
-manta    | android-4.2_r1 or master     | full_manta-userdebug
-grouper  | android-4.2_r1 or master     | full_grouper-userdebug
-tipalia  | android-4.2_r1 or master     | full_tilapia-userdebug
-maguro   | android-4.2_r1 or master     | full_maguro-userdebug
-toro     | android-4.2_r1 or master     | full_toro-userdebug
+manta    | android-4.2.1_r1 or master   | full_manta-userdebug
+grouper  | android-4.2.1_r1 or master   | full_grouper-userdebug
+tipalia  | android-4.2.1_r1 or master   | full_tilapia-userdebug
+maguro   | android-4.2.1_r1 or master   | full_maguro-userdebug
+toro     | android-4.2.1_r1 or master   | full_toro-userdebug
 toroplus | master                       | full_toroplus-userdebug
 panda    | master                       | full_panda-userdebug
 wingray  | android-4.1.2_r1             | full_wingray-userdebug
diff --git a/src/source/building-kernels.md b/src/source/building-kernels.md
index 5c3709d..f62483b 100644
--- a/src/source/building-kernels.md
+++ b/src/source/building-kernels.md
@@ -54,16 +54,16 @@
 
   - The `goldfish` project contains the kernel sources for the emulated
 platforms.
-  - The `msm` project has the sources for ADP1, ADP2, Nexus One, and
-can be used as a starting point for work on Qualcomm MSM chipsets.
-  - The `omap` project is used for PandaBoard and Galaxy Nexus, and
-can be used as a starting point for work on TI OMAP chipsets.
-  - The `samsung` project is used for Nexus S and can be used as a
-starting point for work on Samsung Hummingbird chipsets.
-  - The `tegra` project is for Xoom and Nexus 7, and can be used as
-a starting point for work on NVIDIA Tegra chipsets.
-  - The `exynos` project can be used as a starting point for work
-on Samsung Exynos chipsets.
+  - The `msm` project has the sources for ADP1, ADP2, Nexus One, Nexus 4,
+and can be used as a starting point for work on Qualcomm MSM chipsets.
+  - The `omap` project is used for PandaBoard and Galaxy Nexus,
+and can be used as a starting point for work on TI OMAP chipsets.
+  - The `samsung` project is used for Nexus S,
+and can be used as a starting point for work on Samsung Hummingbird chipsets.
+  - The `tegra` project is for Xoom and Nexus 7,
+and can be used as a starting point for work on NVIDIA Tegra chipsets.
+  - The `exynos` project has the kernel sources for Nexus 10,
+and can be used as a starting point for work on Samsung Exynos chipsets.
 
 ## Downloading a prebuilt gcc ##
 
@@ -88,6 +88,9 @@
 To build the tuna kernel, you may run the previous commands replacing all
 instances of "panda" with "tuna".
 
+  - The kernel for mantaray is `device/samsung/manta/kernel`
+  - The kernel for mako is `device/lge/mako-kernel/kernel`
+  - The kernel for grouper and tilapia is `device/asus/grouper/kernel`
   - The kernel for maguro and toro is `device/samsung/tuna/kernel`
   - The kernel for crespo and crespo4g is `device/samsung/crespo/kernel`
   - The kernel for stingray and wingray is `device/moto/wingray/kernel`