* Added in-page TOC to all pages.
* Removed "Introduction" title from all pages.
diff --git a/pdk/docs/guide/camera.jd b/pdk/docs/guide/camera.jd
index 204c070..f4c9c85 100755
--- a/pdk/docs/guide/camera.jd
+++ b/pdk/docs/guide/camera.jd
@@ -2,24 +2,24 @@
pdk.version=1.0
@jd:body
+<div id="qv-wrapper">
+<div id="qv">
+<h2>In this document</h2>
<a name="toc"/>
-<div style="padding:10px">
-<a href="#androidCameraIntroduction">Introduction</a><br/>
-<a href="#androidCameraBuildingDriver">Building a Camera Library</a><br/>
-<a href="#androidCameraSequenceDiagrams">Sequence Diagrams</a><br/><div style="padding-left:40px">
-
-<a href="#androidCameraSequenceDiagramsPreview">Preview</a><br/>
-<a href="#androidCameraSequenceDiagramsTakePic">Taking a Picture</a><br/></div>
-<a href="#androidCameraInterfaceIntro">Interface</a><br/></div></font></div>
-
-<a name="androidCameraIntroduction"></a><h2>Introduction</h2>
+<ul>
+<li><a href="#androidCameraBuildingDriver">Building a Camera Library</a></li>
+<li><a href="#androidCameraSequenceDiagrams">Sequence Diagrams</a></li>
+<li><a href="#androidCameraInterfaceIntro">Interface</a></li>
+</ul>
+</div>
+</div>
<p>Android's camera subsystem connects the camera application to the application framework and user space libraries, which in turn communicate with the camera hardware layer that operates the physical camera.</p>
<p>The diagram below illustrates the structure of the camera subsystem.</p>
<p><img src="images/androidCameraArchitecture.gif"></p>
-<a name="androidCameraBuildingDriver"></a><h2>Building a Camera Library</h2>
+<a name="androidCameraBuildingDriver"></a><h3>Building a Camera Library</h3>
<p>To implement a camera driver, create a shared library that implements the interface defined in <code>CameraHardwareInterface.h</code>. You must name your shared library <code>libcamera.so</code> so that it will get loaded from <code>/system/lib</code> at runtime. Place libcamera sources and <code>Android.mk</code> in <code>partner/acme/chipset_or_board/libcamera/</code>.</p>
<p>The following stub <code>Android.mk</code> file ensures that <code>libcamera</code> compiles and links to the appropriate libraries:</p>
@@ -49,23 +49,23 @@
</pre>
-<a name="androidCameraSequenceDiagrams"></a><h2>Sequence Diagrams</h2>
+<a name="androidCameraSequenceDiagrams"></a><h3>Sequence Diagrams</h3>
-<a name="androidCameraSequenceDiagramsPreview"></a><h3>Preview</h3>
+<a name="androidCameraSequenceDiagramsPreview"></a><h4>Preview</h4>
<p>The following diagram illustrates the sequence of function calls and actions necessary for your camera to preview.</p>
<img src="images/cameraPreview.jpg">
-<a name="androidCameraSequenceDiagramsTakePic"></a><h3>Taking a Picture</h3>
+<a name="androidCameraSequenceDiagramsTakePic"></a><h4>Taking a Picture</h4>
<p>The following diagram illustrates the sequence of function calls and actions necessary for your camera to take a picture.</p>
<img src="images/cameraTakePicture.jpg">
-<a name="androidCameraInterfaceIntro"></a><h2>Interface</h2>
+<a name="androidCameraInterfaceIntro"></a><h3>Interface</h3>