diff --git a/src/compatibility/downloads.md b/src/compatibility/downloads.md
index e36b1b3..3c0225b 100644
--- a/src/compatibility/downloads.md
+++ b/src/compatibility/downloads.md
@@ -26,7 +26,8 @@
 Android 2.3 is found in the 'gingerbread' branch in the open-source tree.
 
 - [Android 2.3 Compatibility Definition Document (CDD)](2.3/android-2.3.3-cdd.pdf)
-- [Android 2.3 R8 Compatibility Test Suite (CTS)](http://dl.google.com/dl/android/cts/android-cts-2.3_r8-x86.zip)
+- [Android 2.3 R9 Compatibility Test Suite (CTS)](http://dl.google.com/dl/android/cts/android-cts-2.3_r9-linux_x86-armv5.zip)
+- [Android 2.3 R2 CTS Verifier](http://dl.google.com/dl/android/cts/android-cts-verifier-2.3_r2-linux_x86-armv5.zip)
 
 ## Android 2.2 ##
 
diff --git a/src/source/build-numbers.md b/src/source/build-numbers.md
index 427db60..72e5dc7 100644
--- a/src/source/build-numbers.md
+++ b/src/source/build-numbers.md
@@ -36,10 +36,10 @@
 Eclair         | 2.1 (incl. 2.1-update 1) | API level 7, NDK 3
 Froyo          | 2.2.x        | API level 8, NDK 4
 Gingerbread    | 2.3 - 2.3.2  | API level 9, NDK 5
-Gingerbread    | 2.3.3 - 2.3.5            | API level 10
+Gingerbread    | 2.3.3 - 2.3.7            | API level 10
 Honeycomb      | 3.0                      | API level 11
 Honeycomb      | 3.1                      | API level 12
-Honeycomb      | 3.2                      | API level 13
+Honeycomb      | 3.2 - 3.2.1              | API level 13
 
 Starting with Cupcake, individual builds are identified with a short
 build code, e.g. FRF85B.
@@ -96,7 +96,10 @@
 GRI54  | android-2.3.3_r1.1 | Nexus S
 GRJ06D | android-2.3.4_r0.9 | Nexus S 4G
 GRJ22  | android-2.3.4_r1   | Nexus One, Nexus S, Nexus S 4G
-GRJ90  | android-2.3.5_r1   | latest Gingerbread version, Nexus S 4G
+GRJ90  | android-2.3.5_r1   | Nexus S 4G
+GRK39C |                    | Nexus S
+GRK39F |                    | Nexus One, Nexus S
+GWK74  |                    | latest Gingerbread version, Nexus S 4G
 
 The branches donut, eclair, froyo, gingerbread represent development
 branches that do not exactly match configurations that were tested
@@ -117,7 +120,9 @@
 HWI69  | android-3.0_r1.2
 HRI93  | android-3.0_r1.3
 HMJ37  | android-3.1_r1
-HTJ85B | android-3.2_r1     | latest Honeycomb version
+HTJ85B | android-3.2_r1
+HTK55D |
+HTK75D |                    | 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 8b1dae7..62023d2 100644
--- a/src/source/building-devices.md
+++ b/src/source/building-devices.md
@@ -163,6 +163,7 @@
 2.3.3 (GRI40)   | I9020XXKA3           | I9020XXKB1      | All previous versions
 2.3.4 (GRJ22)   | I9020XXKA3           | I9020XXKD1      | All previous versions
 2.3.5 (GRJ90)   | I9020XXKA3           | I9020XXKF1      | All previous versions
+2.3.6 (GRK39F)  | I9020XXKA3           | I9020XXKF1      | All previous versions
 
 Nexus S (850MHz version "UC"):
 
@@ -171,6 +172,8 @@
 2.3.3 (GRI54)   | I9020XXKA3           | I9020UCKB2
 2.3.4 (GRJ22)   | I9020XXKA3           | I9020UCKD1      | All previous versions
 2.3.5 (GRJ90)   | I9020XXKA3           | I9020UCKF1      | All previous versions
+2.3.6 (GRK39C)  | I9020XXKA3           | I9020UCKF1      | All previous versions
+2.3.6 (GRK39F)  | I9020XXKA3           | I9020UCKF1      | All previous versions
 
 Nexus S (Korea version "KR"):
 
@@ -179,6 +182,7 @@
 2.3.3 (GRI54)   | I9020XXKA3           | I9020KRKB3
 2.3.4 (GRJ22)   | I9020XXKA3           | M200KRKC1       | All previous versions
 2.3.5 (GRJ90)   | I9020XXKA3           | M200KRKC1       | All previous versions
+2.3.6 (GRK39F)  | I9020XXKA3           | M200KRKC1       | All previous versions
 
 Nexus S 4G:
 
@@ -187,9 +191,15 @@
 2.3.4 (GRJ06D)  | D720SPRKC5           | D720SPRKC9
 2.3.4 (GRJ22)   | D720SPRKC5           | D720SPRKD8      | All previous versions
 2.3.5 (GRJ90)   | D720SPRKC5           | D720SPRKE5      | All previous versions
+2.3.7 (GWK74)   | D720SPRKE1           | D720SPRKH1 (*)  | All previous versions
 
 If you're building a new version of Android, if your Nexus S or Nexus S 4G has
 an older bootloader and radio image that is marked as being also possible in
 the table above but is not recognized by fastboot, you can locally
 delete the `version-bootloader` and `version-baseband` lines in
 `device/samsung/crespo/board-info.txt` or `device/samsung/crespo4g/board-info.txt`.
+
+(*) As a note, radio version D720SPRKH1 for Nexus S 4G sometimes erroneously
+reports version D720SPRKE1. If this is the case for your Nexus S 4G, you can
+locally modify the version-baseband line in
+`device/samsung/crespo4g/board-info.txt` accordingly.
diff --git a/src/source/sidebar.md b/src/source/sidebar.md
index 373db15..4a9f797 100644
--- a/src/source/sidebar.md
+++ b/src/source/sidebar.md
@@ -26,7 +26,6 @@
     - [Git Resources](git-resources.html)
 - [Using Eclipse](using-eclipse.html)
 - [Code Style Guidelines](code-style.html)
-- [Development Tips and Tricks](developing.html)
 - [FAQs](/faqs.html)
 
 
diff --git a/src/tech/debugging/index.md b/src/tech/debugging/index.md
new file mode 100644
index 0000000..4ae4fc9
--- /dev/null
+++ b/src/tech/debugging/index.md
@@ -0,0 +1,23 @@
+<!--
+   Copyright 2010 The Android Open Source Project 
+
+   Licensed under the Apache License, Version 2.0 (the "License"); 
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+# Debugging the Android platform #
+
+The following sections contain information, documentation, tips and tricks
+about debugging Android at the platform level, typically during development
+of platform-level features.
+
+[&raquo; Debugging Native Memory Use](/tech/debugging/native-memory.html)
diff --git a/src/source/developing.md b/src/tech/debugging/native-memory.md
similarity index 86%
rename from src/source/developing.md
rename to src/tech/debugging/native-memory.md
index 042ec6a..755a429 100644
--- a/src/source/developing.md
+++ b/src/tech/debugging/native-memory.md
@@ -14,14 +14,11 @@
    limitations under the License.
 -->
 
-# Development Tips and Tricks #
+# Debugging Native Memory Use #
 
-A collection of helpful tricks and available facilities for developing
-the platform code.  This tips assume that you are working with an eng
+This tip assume that you are working with an eng
 or userdebug build of the platform, not on a production device.
 
-## Debugging Native Memory Use ##
-
 Android's native memory allocator has some useful debugging features.  You
 can turn on memory tracking with:
 
diff --git a/src/tech/debugging/sidebar2.md b/src/tech/debugging/sidebar2.md
new file mode 100644
index 0000000..3ab9f67
--- /dev/null
+++ b/src/tech/debugging/sidebar2.md
@@ -0,0 +1,2 @@
+# Debugging Topics #
+- [Native Memory Use](/tech/debugging/native-memory.html)
diff --git a/src/tech/index.md b/src/tech/index.md
index 4321baf..f7aa958 100644
--- a/src/tech/index.md
+++ b/src/tech/index.md
@@ -30,6 +30,13 @@
 [&raquo; Dalvik Information](/tech/dalvik/index.html)
 
 
+## Debugging ##
+Android is a large and complex system. This section includes tips and tricks
+about debugging at the platform level.
+
+[&raquo; Debugging Information](/tech/debugging/index.html)
+
+
 ## Encryption Technical Information ##
 The Android Open-Source Project includes the ability to encrypt the user's data.
 This document is written for 3rd parties developing Android devices who want to
diff --git a/src/tech/sidebar.md b/src/tech/sidebar.md
index 4d8a6e7..67ec0a4 100644
--- a/src/tech/sidebar.md
+++ b/src/tech/sidebar.md
@@ -1,4 +1,5 @@
 # Topics #
 - [Dalvik](/tech/dalvik/index.html)
+- [Debugging](/tech/debugging/index.html)
 - [Encryption](/tech/encryption/index.html)
 - [Security](/tech/security/index.html)