diff --git a/src/devices/audio.jd b/src/devices/audio.jd
index 50be277..9f6cfd0 100644
--- a/src/devices/audio.jd
+++ b/src/devices/audio.jd
@@ -172,7 +172,7 @@
 <h3 id="codecs">Media Codecs</h3>
 
 <p>Ensure that the audio codecs that your hardware and drivers support are properly declared for your product. See
-  <a href="media.html#expose"> Exposing Codecs to the Framework</a> for information on how to do this.
+  <a href="{@docRoot}guide/media.html#expose"> Exposing Codecs to the Framework</a> for information on how to do this.
 </p>
 
 <h2 id="configuring">
diff --git a/src/devices/camera.jd b/src/devices/camera.jd
index e85a23d..1e709c8 100644
--- a/src/devices/camera.jd
+++ b/src/devices/camera.jd
@@ -138,7 +138,7 @@
 <li>Declare your camera’s media codec, format, and resolution capabilities in
 <code>device/&lt;company_name&gt;/&lt;device_name&gt;/media_profiles.xml</code> and
 <code>device/&lt;company_name&gt;/&lt;device_name&gt;/media_codecs.xml</code> XML files.
- For more information, see <a href="media.html#expose"> Exposing
+ For more information, see <a href="{@docRoot}guide/media.html#expose"> Exposing
  Codecs and Profiles to the Framework</a> for information on how to do this.
 </p></code>
 
@@ -171,4 +171,4 @@
 </pre>
 </li>
 
-</ol>
+</ol>
\ No newline at end of file
diff --git a/src/devices/tech/input/input-device-configuration-files.jd b/src/devices/tech/input/input-device-configuration-files.jd
index 06c8994..e5629c3 100644
--- a/src/devices/tech/input/input-device-configuration-files.jd
+++ b/src/devices/tech/input/input-device-configuration-files.jd
@@ -123,5 +123,5 @@
 correctly for all internal input devices.</p>
 <h2 id="validation">Validation</h2>
 <p>Make sure to validate your input device configuration files using the
-<a href="validate-keymaps.html">Validate Keymaps</a> tool.</p>
+<a href="/tech/input/validate-keymaps.html">Validate Keymaps</a> tool.</p>
 
diff --git a/src/devices/tech/input/key-character-map-files.jd b/src/devices/tech/input/key-character-map-files.jd
index e60484e..7b1ac5b 100644
--- a/src/devices/tech/input/key-character-map-files.jd
+++ b/src/devices/tech/input/key-character-map-files.jd
@@ -422,4 +422,4 @@
 or user-selectable keyboard layouts.</p>
 <h2 id="validation">Validation</h2>
 <p>Make sure to validate your key character map files using the
-<a href="validate-keymaps.html">Validate Keymaps</a> tool.</p>
+<a href="/tech/input/validate-keymaps.html">Validate Keymaps</a> tool.</p>
diff --git a/src/devices/tech/input/key-layout-files.jd b/src/devices/tech/input/key-layout-files.jd
index ecab0ef..e925881 100644
--- a/src/devices/tech/input/key-layout-files.jd
+++ b/src/devices/tech/input/key-layout-files.jd
@@ -239,7 +239,7 @@
     input system uses a virtual key map file to translate X / Y touch coordinates
     into Linux key codes, then uses the key layout file to translate
     Linux key codes into Android key codes.</p>
-<p>Refer to the section on <a href="touch-devices.html">Touch Devices</a>
+<p>Refer to the section on <a href="/tech/input/touch-devices.html">Touch Devices</a>
 for more details about virtual key map files.</p>
 <p>The key layout file for the touch screen input device must specify the
 appropriate key mapping and include the <code>VIRTUAL</code> flag for each key.</p>
@@ -281,4 +281,4 @@
 </code></pre>
 <h2 id="validation">Validation</h2>
 <p>Make sure to validate your key layout files using the
-<a href="validate-keymaps.html">Validate Keymaps</a> tool.</p>
+<a href="/tech/input/validate-keymaps.html">Validate Keymaps</a> tool.</p>
diff --git a/src/devices/tech/input/keyboard-devices.jd b/src/devices/tech/input/keyboard-devices.jd
index e7740fe..aa968ac 100644
--- a/src/devices/tech/input/keyboard-devices.jd
+++ b/src/devices/tech/input/keyboard-devices.jd
@@ -37,7 +37,9 @@
 </ul>
 <p>Joysticks are currently classified as keyboards because joystick and gamepad buttons
 are reported by <code>EV_KEY</code> events in the same way keyboard keys are reported.  Thus
-joysticks and gamepads also make use of key map files for configuration.</p>
+joysticks and gamepads also make use of key map files for configuration.
+Refer to the section on <a href="/tech/input/joystick-devices.html">Joystick Devices</a> for
+more information.</p>
 <p>Once an input device has been classified as a keyboard, the system loads the
 input device configuration file and keyboard layout for the keyboard.</p>
 <p>The system then tries to determine additional characteristics of the device.</p>
@@ -168,9 +170,9 @@
 <p>Refer to the following sections for more details about the files that
 participate in keyboard configuration:</p>
 <ul>
-<li><a href="key-layout-files.html">Key Layout Files</a></li>
-<li><a href="key-character-map-files.html">Key Character Map Files</a></li>
-<li><a href="input-device-configuration-files.html">Input Device Configuration Files</a></li>
+<li><a href="/tech/input/key-layout-files.html">Key Layout Files</a></li>
+<li><a href="/tech/input/key-character-map-files.html">Key Character Map Files</a></li>
+<li><a href="/tech/input/input-device-configuration-files.html">Input Device Configuration Files</a></li>
 </ul>
 <h3 id="properties">Properties</h3>
 <p>The following input device configuration properties are used for keyboards.</p>
diff --git a/src/devices/tech/input/migration-guide.jd b/src/devices/tech/input/migration-guide.jd
index ff39dfd..dbdf666 100644
--- a/src/devices/tech/input/migration-guide.jd
+++ b/src/devices/tech/input/migration-guide.jd
@@ -38,7 +38,7 @@
 function input devices.  These files should simple contain a line to set
 the keyboard type to <code>SPECIAL_FUNCTION</code>.</p>
 <p>A good way to ensure that all built-in input devices are appropriately configured
-is to run <a href="dumpsys.html">Dumpsys</a> and look for devices that
+is to run <a href="/tech/input/dumpsys.html">Dumpsys</a> and look for devices that
 are inappropriately using <code>Generic.kcm</code>.</p>
 <h2 id="migrating-to-android-honeycomb-32">Migrating to Android Honeycomb 3.2</h2>
 <p>In Honeycomb 3.2, we added support for joysticks and extended the key layout file
@@ -51,5 +51,5 @@
 multitouch input protocol correctly according to the standard.</p>
 <p>You will also need to update your input device configuration files because some
 properties have been changed to be simpler and more systematic.</p>
-<p>Refer to <a href="touch-devices.html">Touch Devices</a> for more details about
-driver requirements.</p>
+<p>Refer to <a href="/tech/input/touch-devices.html">Touch Devices</a> for more details about
+driver requirements.</p>
\ No newline at end of file
diff --git a/src/devices/tech/input/touch-devices.jd b/src/devices/tech/input/touch-devices.jd
index e7c909a..21567d3 100644
--- a/src/devices/tech/input/touch-devices.jd
+++ b/src/devices/tech/input/touch-devices.jd
@@ -545,7 +545,7 @@
 <p>Refer to the following sections for more details about the files that
 participate in keyboard configuration:</p>
 <ul>
-<li><a href="input-device-configuration-files.html">Input Device Configuration Files</a></li>
+<li><a href="/tech/input/input-device-configuration-files.html">Input Device Configuration Files</a></li>
 <li><a href="#virtual-key-map-files">Virtual Key Map Files</a></li>
 </ul>
 <h3 id="properties">Properties</h3>
diff --git a/src/devices/tech/security/index.jd b/src/devices/tech/security/index.jd
index 2c0186c..5a79598 100644
--- a/src/devices/tech/security/index.jd
+++ b/src/devices/tech/security/index.jd
@@ -398,7 +398,7 @@
 administrator and enforced by the operating system. Filesystem encryption
 requires the use of a user password, pattern-based screen lock is not supported.</p>
 <p>More details on implementation of filesystem encryption are available at
-<a href="/devices/tech/encryption/android_crypto_implementation.html">https://source.android.com/devices/tech/encryption/android_crypto_implementation.html</a></p>
+<a href="/tech/encryption/android_crypto_implementation.html">https://source.android.com/tech/encryption/android_crypto_implementation.html</a></p>
 
 <h2 id="password-protection">Password Protection</h2>
 <p>Android can be configured to verify a user-supplied password prior to providing
diff --git a/src/source/build-numbers.jd b/src/source/build-numbers.jd
index 3977964..cf33d51 100644
--- a/src/source/build-numbers.jd
+++ b/src/source/build-numbers.jd
@@ -125,11 +125,6 @@
 <td>4.2.x</td>
 <td>API level 17</td>
 </tr>
-<tr>
-<td>Jelly Bean</td>
-<td>4.3</td>
-<td>API level 18</td>
-</tr>
 </tbody>
 </table>
 <p>Starting with Cupcake, individual builds are identified with a short
@@ -416,19 +411,11 @@
 <td>android-4.1.1_r6.1</td>
 <td>Nexus 7</td>
 </tr>
-
 <tr>
 <td>JZO54K</td>
 <td>android-4.1.2_r1</td>
 <td>Nexus S, Galaxy Nexus, Nexus 7</td>
 </tr>
-
-<tr>
-<td>JZO54L</td>
-<td>android-4.1.2_r2</td>
-<td></td>
-</tr>
-
 <tr>
 <td>JOP40C</td>
 <td>android-4.2_r1</td>
@@ -456,31 +443,13 @@
 <tr>
 <td>JDQ39</td>
 <td>android-4.2.2_r1</td>
-<td>Galaxy Nexus, Nexus 7, Nexus 4, Nexus 10</td>
-</tr>
-
-<tr>
-<td>JDQ39B</td>
-<td>android-4.2.2_r1.1</td>
-<td>Nexus 7</td>
-</tr>
-
-<tr>
-<td>JDQ39E</td>
-<td>android-4.2.2_r1.1</td>
-<td>Nexus 4</td>
-</tr>
-
-<tr>
-<td>JWR66N</td>
-<td>android-4.2.3_r1</td>
 <td>latest Jelly Bean version, Galaxy Nexus, Nexus 7, Nexus 4, Nexus 10</td>
 </tr>
 
 </tbody>
 </table>
 <p>The branches froyo, gingerbread, ics-mr0, ics-mr1, jb-dev,
-jb-mr1-dev, jb-mr1.1-dev, jb-mr2-dev
+jb-mr1-dev, jb-mr1.1-dev
 represent development
 branches that do not exactly match configurations that were tested
 by Google. They might contain a variety of changes in addition to
diff --git a/src/source/building-devices.jd b/src/source/building-devices.jd
index 5bb2f2c..bbf49ba 100644
--- a/src/source/building-devices.jd
+++ b/src/source/building-devices.jd
@@ -29,7 +29,7 @@
 information that is specific to individual devices.</p>
 
 <p>With the current release, it is possible to build for
-Nexus 4, Nexus 7, and for some variants of Galaxy Nexus.
+Nexus 4, Nexus 10, Nexus 7, 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.</p>
 <p>For Nexus 4 "mako" and on Nexus 7 "grouper" (Wi-Fi) and "tilapia" (Mobile),
@@ -37,8 +37,7 @@
 and all the hardware is functional.
 Due to hardware differences, do not use 4.1.1 on a Nexus 7 that
 was originally sold with 4.1.2 or newer.</p>
-<p>All configurations of Nexus 10 "manta" can be used with 4.2.2.
-On those devices, graphics, audio,
+<p>All configurations of Nexus 10 "manta" can be used. On those devices, graphics, audio,
 Wi-Fi, Bluetooth, camera, NFC, GPS and orientation sensors are functional.</p>
 <p>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
@@ -86,11 +85,11 @@
 </tr>
 <tr>
 <td>grouper</td>
-<td>Press and hold <em>Volume Down</em>, then press and hold <em>Power</em></td>
+<td>Press <em>Power</em> for a second, and press <em>Volume Down</em> when the bootloader logo appears</td>
 </tr>
 <tr>
 <td>tilapia</td>
-<td>Press and hold <em>Volume Down</em>, then press and hold <em>Power</em></td>
+<td>Press <em>Power</em> for a second, and press <em>Volume Down</em> when the bootloader logo appears</td>
 </tr>
 <tr>
 <td>phantasm</td>
@@ -187,43 +186,43 @@
 <tbody>
 <tr>
 <td>manta</td>
-<td>android-4.2.2_r1</td>
+<td>android-4.2.2_r1 or master</td>
 <td>full_manta-userdebug</td>
 </tr>
 <tr>
 <td>mako</td>
-<td>android-4.3_r1 or master</td>
-<td>aosp_mako-userdebug</td>
+<td>android-4.2.2_r1 or master</td>
+<td>full_mako-userdebug</td>
 </tr>
 <tr>
 <td>grouper</td>
-<td>android-4.3_r1 or master</td>
-<td>aosp_grouper-userdebug</td>
+<td>android-4.2.2_r1 or master</td>
+<td>full_grouper-userdebug</td>
 </tr>
 <tr>
 <td>tilapia</td>
-<td>android-4.3_r1 or master</td>
-<td>aosp_grouper-userdebug</td>
+<td>android-4.2.2_r1 or master</td>
+<td>full_grouper-userdebug</td>
 </tr>
 <tr>
 <td>maguro</td>
-<td>android-4.3_r1 or master</td>
-<td>aosp_maguro-userdebug</td>
+<td>android-4.2.2_r1 or master</td>
+<td>full_maguro-userdebug</td>
 </tr>
 <tr>
 <td>toro</td>
-<td>android-4.3_r1 or master</td>
-<td>aosp_toro-userdebug</td>
+<td>android-4.2.2_r1 or master</td>
+<td>full_toro-userdebug</td>
 </tr>
 <tr>
 <td>toroplus</td>
 <td>master</td>
-<td>aosp_toroplus-userdebug</td>
+<td>full_toroplus-userdebug</td>
 </tr>
 <tr>
 <td>panda</td>
 <td>master</td>
-<td>aosp_panda-userdebug</td>
+<td>full_panda-userdebug</td>
 </tr>
 <tr>
 <td>wingray</td>
@@ -271,4 +270,4 @@
 for Nexus S and Nexus S 4G
 are available from
 <a href="https://developers.google.com/android/nexus/images">Google's factory image page</a>.</p>
-<p>Factory images for the Motorola Xoom are distributed directly by Motorola.</p>
+<p>Factory images for the Motorola Xoom are distributed directly by Motorola.</p>
\ No newline at end of file
diff --git a/src/source/building-running.jd b/src/source/building-running.jd
index ae4116c..3fcd457 100644
--- a/src/source/building-running.jd
+++ b/src/source/building-running.jd
@@ -50,7 +50,7 @@
 <h2 id="choose-a-target">Choose a Target</h2>
 <p>Choose which target to build with <code>lunch</code>.  The exact configuration can be passed as
 an argument, e.g. </p>
-<pre><code>$ lunch aosp_arm-eng
+<pre><code>$ lunch full-eng
 </code></pre>
 <p>The example above refers to a complete build for the emulator, with all debugging enabled.</p>
 <p>If run with no arguments <code>lunch</code> will prompt you to choose a target from the menu. </p>
@@ -66,19 +66,19 @@
 </thead>
 <tbody>
 <tr>
-<td>aosp_arm</td>
-<td>ARM emulator</td>
-<td>AOSP, fully configured with all languages, apps, input methods</td>
+<td>full</td>
+<td>emulator</td>
+<td>fully configured with all languages, apps, input methods</td>
 </tr>
 <tr>
-<td>aosp_maguro</td>
+<td>full_maguro</td>
 <td>maguro</td>
-<td>AOSP, running on Galaxy Nexus GSM/HSPA+ ("maguro")</td>
+<td><code>full</code> build running on Galaxy Nexus GSM/HSPA+ ("maguro")</td>
 </tr>
 <tr>
-<td>aosp_panda</td>
+<td>full_panda</td>
 <td>panda</td>
-<td>AOSP, running on PandaBoard ("panda")</td>
+<td><code>full</code> build running on PandaBoard ("panda")</td>
 </tr>
 </tbody>
 </table>