diff --git a/docs/html/preview/setup-sdk.jd b/docs/html/preview/setup-sdk.jd
index 66262dc44d672..78003f546baea 100644
--- a/docs/html/preview/setup-sdk.jd
+++ b/docs/html/preview/setup-sdk.jd
@@ -7,7 +7,7 @@ as using the Android SDK Manager and creating projects. If you're new to
 Android, see <a href="/training/basics/firstapp/index.html">Building Your First
 App</a> training lesson first.</a></p>
 
-<h2>Download the SDK</h2>
+<h2 id="downloadSdk">Download the SDK</h2>
 
 <ol>
   <li>Start the Android SDK Manager.</li>
@@ -20,7 +20,7 @@ App</a> training lesson first.</a></p>
     <b>Install</b>.</li>
 </ol>
 
-<h2>Set Up Hardware and AVDs</h2>
+<h2 id="setupHardware">Set Up Hardware and AVDs</h2>
 
 <p>The Android L developer preview provides you with 32-bit system images
 to flash the following devices:
@@ -35,10 +35,9 @@ to flash the following devices:
 experimental 64-bit system images along with standard 32-bit system images.
 </p>
 
-<h3>Instal the L Preview System Image</h3>
+<h3 id="installImage">Install the L Preview System Image</h3>
 
-<!-- Will we get an official warning text from the lawyercats? Is this it? -->
-<p class="warning"><b>Warning</b>: This is a preview version of the Android
+<p class="warning"><b>Warning:</b> This is a preview version of the Android
 system image, and is subject to change. Your use of this system image is
 governed by the Android SDK Preview License Agreement. The Android preview
 system image is not a stable release, and may contain errors and defects that
@@ -49,35 +48,37 @@ can cause your phone and installed services and applications to stop working.
 
 
 <ol>
-  <li>Download and extract the Android Developer Preview package to a directory
-  (which we'll call <code>&lt;l_download_dir&gt;</code> in these
-  instructions).</li>
-  <li>Connect your powered-off Android device to your development machine. Put
-  the device in fastboot mode by pressing and holding the following buttons:
-    <ul>
-    <li><strong>Nexus 5:</strong> <i>volume down</i> + <i>volume up</i> +
-        <i>power</i></li>
-    <li><strong>Nexus 7:</strong> <i>volume down</i> + <i>power</i> </li>
-    </ul>
-    <p class="note">Alternatively, you can enter fastboot mode by booting up
-    the device and running <code>adb reboot bootloader</code> with USB debugging
-    turned on.</p>
+  <li>Download and uncompress the Android Developer Preview package.
+    <p class="table-caption" id="table1">
+      <strong>Table 1.</strong> L Developer Preview system images.</p>
+    <table>
+      <tr>
+        <th scope="col">Device</th>
+        <th scope="col">Download</th>
+        <th scope="col">MD5 Checksum</th>
+        <th scope="col">SHA-1 Checksum</th>
+      </tr>
+      <tr id="hammerhead">
+        <td>Nexus 5 (GSM/LTE) "hammerhead"</td>
+        <td><!-- TODO --></td>
+        <td><code>5a6ae77217978cb7b958a240c2e80b57</code></td>
+        <td><code>ac1d8a8e4f4a1dca5864dc733caa940bffc28616</code></td>
+      </tr>
+      <tr id="razor">
+        <td>Nexus 7 (Wifi) "razor"</td>
+        <td><!-- TODO --></td>
+        <td><code>b293a5d3a4e07beabebcc0be85ad68a2</code></td>
+        <td><code>d0ddf8ce733ba2a34279cdff8827fd604762c2342d</code></td>
+      </tr>
+    </table>
   </li>
+
   <li>Follow the instructions at
   <a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>
-  to set up your system for flashing devices.</li>
-  <li>Run the <code>&lt;l_download_dir&gt;/flash-all</code> script
-  corresponding to your platform. This script flashes all of the system data
-  onto the phone.</li> <!-- Confirm names of flash scripts -->
-  <li>(Optional) After flashing is complete, lock your device's bootloader by
-  putting it in   fastboot mode and running <code>fastboot oem lock</code>.
-  (This does not wipe   your device.) Once you do this,  you will not be able to
-  flash your device until you run   run <code>fastboot oem   unlock</code>,
-  which unlocks the bootloader and wipes your device. We recommend you leave the
-  bootloader unlocked until you are done with flashing the device.</li>
+  to flash the image onto your device.</li>
 </ol>
 
-<h3>Revert a Device to Factory Specifications</h3>
+<h3 id="revertDevice">Revert a Device to Factory Specifications</h3>
 
   <p>If you want to uninstall the L Preview and revert the device to factory
 specifications, go to <a href="http://developers.google.com/android
@@ -85,8 +86,7 @@ specifications, go to <a href="http://developers.google.com/android
 to flash to for your device. Follow the instructions on that page to flash the
 image to your device.</p>
 
-
-<h3>Set up an AVD</h3>
+<h3 id="setupAVD">Set up an AVD</h3>
 
 <p>You can set up <a href="{@docRoot}tools/devices/">Android Virtual Devices
 (AVD)</a> and use the emulator to build and test apps with the L Preview.</p>
@@ -109,7 +109,7 @@ image to your device.</p>
   </li>
 </ol>
 
-<h2>Create a Project</h2>
+<h2 id="createProject">Create a Project</h2>
 
 <ol>
   <li>Create a new Android project with the following properties: