* Added in-page TOC to all pages.
* Removed "Introduction" title from all pages.
diff --git a/pdk/docs/guide/build_system.jd b/pdk/docs/guide/build_system.jd
index 36936aa..64216d8 100755
--- a/pdk/docs/guide/build_system.jd
+++ b/pdk/docs/guide/build_system.jd
@@ -3,34 +3,26 @@
@jd:body
+<div id="qv-wrapper">
+<div id="qv">
+<h2>In this document</h2>
<a name="toc"/>
-<div style="padding:10px">
-<a href="#androidBuildSystemIntroduction">Introduction</a><br/>
-<a href="#androidBuildSystemUnderstanding">Understanding Android's Build System</a><br/><div style="padding-left:40px">
-
-<a href="#androidBuildSystemOverview">Understanding the makefile</a><br/>
-<a href="#androidBuildSystemLayers">Layers</a><br/>
-<a href="#androidSourceSetupBuildingCodeBase">Building the Android Platform</a><br/><div style="padding-left:40px">
-
-<a href="#androidSourceSetupBuildingDeviceCodeBase">Device Code</a><br/>
-<a href="#androidBuildingCleaning">Cleaning Up</a><br/>
-<a href="#androidBuildingSpeeding">Speeding Up Rebuilds</a><br/>
-<a href="#androidBuildingTroubleshooting">Troubleshooting</a><br/></div>
-<a href="#androidSourceSetupBuildingKernel">Building the Android Kernel</a><br/><div style="padding-left:40px">
-
-<a href="#androidSourceSetupBuildingKernelCheckingBranch">Checking Out a Branch</a><br/>
-<a href="#androidSourceSetupBuildingKernelBranchLocation">Verifying Location</a><br/>
-<a href="#androidSourceSetupBuildingKernelBuild">Building the Kernel</a><br/></div></div></div>
-
-<a name="androidBuildSystemIntroduction"></a><h2>Introduction</h2>
+<ul>
+<li><a href="#androidBuildSystemOverview">Understanding the makefile</a></li>
+<li><a href="#androidBuildSystemLayers">Layers</a></li>
+<li><a href="#androidSourceSetupBuildingCodeBase">Building the Android Platform</a></li>
+<li><a href="#androidSourceSetupBuildingKernel">Building the Android Kernel</a></li>
+</ul>
+</div>
+</div>
<p>Android uses a custom build system to generate tools, binaries, and documentation. This document provides an overview of Android's build system and instructions for doing a simple build. </p>
<p>Android's build system is make based and requires a recent version of GNU Make (note that Android uses advanced features of GNU Make that may not yet appear on the GNU Make web site). Before continuing, check your version of make by running <code>% make -v</code>. If you don't have version 3.80 or greater, you need to <a href="http://www.gnu.org/software/make/">upgrade your version of make</a>. </p>
-<a name="androidBuildSystemUnderstanding"></a><h2>Understanding Android's Build System</h2>
-<a name="androidBuildSystemOverview"></a><h3>Understanding the makefile</h3>
+
+<a name="androidBuildSystemOverview"></a><h4>Understanding the makefile</h4>
<p>A makefile defines how to build a particular application. Makefiles typically include all of the following elements:</p>
<ol>
@@ -58,7 +50,7 @@
<p>The snippet above includes artificial line breaks to maintain a print-friendly document.</p>
-<a name="androidBuildSystemLayers"></a><h3>Layers</h3>
+<a name="androidBuildSystemLayers"></a><h4>Layers</h4>
<p>The build hierarchy includes the abstraction layers described in the table below.</p>
@@ -92,12 +84,12 @@
</tr>
</table>
-<a name="androidSourceSetupBuildingCodeBase"></a><h2>Building the Android Platform</h2>
+<a name="androidSourceSetupBuildingCodeBase"></a><h3>Building the Android Platform</h3>
<p>This section describes how to build the default version of Android. Once you are comfortable with a generic build, then you can begin to modify Android for your own target device.</p>
-<a name="androidSourceSetupBuildingDeviceCodeBase"></a><h3>Device Code</h3>
+<a name="androidSourceSetupBuildingDeviceCodeBase"></a><h4>Device Code</h4>
<p>To do a generic build of android, source <code>build/envsetup.sh</code>, which contains necessary variable and function definitions, as described below.</p>
<pre class="prettyprint">
@@ -117,12 +109,12 @@
</pre>
-<a name="androidBuildingCleaning"></a><h3>Cleaning Up</h3>
+<a name="androidBuildingCleaning"></a><h4>Cleaning Up</h4>
<p>Execute <code>% m clean</code> to clean up the binaries you just created. You can also execute <code>% m clobber</code> to get rid of the binaries of all combos. <code>% m clobber</code> is equivalent to removing the <code>//out/</code> directory where all generated files are stored.</p>
-<a name="androidBuildingSpeeding"></a><h3>Speeding Up Rebuilds</h3>
+<a name="androidBuildingSpeeding"></a><h4>Speeding Up Rebuilds</h4>
<p> The binaries of each combo are stored as distinct sub-directories of <code>//out/</code>, making it possible to quickly switch between combos without having to recompile all sources each time. </p>
<p> However, performing a clean rebuild is necessary if the build system doesn't catch changes to environment variables or makefiles. If this happens often, you should define the <code>USE_CCACHE</code> environment variable as shown below: </p>
@@ -134,7 +126,7 @@
<p><code>ccache</code> binaries are provided in <code>//prebuilt/...</code> and don't need to get installed on your system.</p>
-<a name="androidBuildingTroubleshooting"></a><h3>Troubleshooting</h3>
+<a name="androidBuildingTroubleshooting"></a><h4>Troubleshooting</h4>
<p>The following error is likely caused by running an outdated version of Java.</p>
<pre class="prettyprint">
@@ -155,7 +147,7 @@
<p>If you do have Java 1.5 or later and your receive this error, verify that you have properly updated your <code>PATH</code> variable.</p>
-<a name="androidSourceSetupBuildingKernel"></a><h2>Building the Android Kernel</h2>
+<a name="androidSourceSetupBuildingKernel"></a><h3>Building the Android Kernel</h3>
<p>This section describes how to build Android's default kernel. Once you are comfortable with a generic build, then you can begin to modify Android drivers for your own target device.</p>
@@ -168,7 +160,7 @@
<p>Then switch to the kernel directory <code>/home/joe/android/kernel</code>.
-<a name="androidSourceSetupBuildingKernelCheckingBranch"></a><h3>Checking Out a Branch</h3>
+<a name="androidSourceSetupBuildingKernelCheckingBranch"></a><h4>Checking Out a Branch</h4>
<p>The default branch is always <code>android</code>. To check out a different branch, execute the following:</p>
@@ -182,7 +174,7 @@
<p>To simplify code management, give your local branch the same name as the remote branch it is tracking (as illustrated in the snippet above). Switch between branches by executing <code>% git checkout <branchname></code>.</p>
-<a name="androidSourceSetupBuildingKernelBranchLocation"></a><h3>Verifying Location</h3>
+<a name="androidSourceSetupBuildingKernelBranchLocation"></a><h4>Verifying Location</h4>
<p>Find out which branches exist (both locally and remotely) and which one is active (marked with an asterisk) by executing the following:</p>
<pre class="prettyprint">
@@ -197,7 +189,7 @@
<p>To only see local branches, omit the <code>-a</code> flag.</p>
-<a name="androidSourceSetupBuildingKernelBuild"></a><h3>Building the Kernel</h3>
+<a name="androidSourceSetupBuildingKernelBuild"></a><h4>Building the Kernel</h4>
<p>To build the kernel, execute:</p>
<pre class="prettyprint">