Merge branch 'eclair' into eclair-release
diff --git a/tools/droiddoc/templates-sdk/resourcespage.cs b/tools/droiddoc/templates-sdk/resourcespage.cs
index 526d7da..12bcbad 100644
--- a/tools/droiddoc/templates-sdk/resourcespage.cs
+++ b/tools/droiddoc/templates-sdk/resourcespage.cs
@@ -10,7 +10,12 @@
 <a name="top"></a>
 <div class="g-unit" id="doc-content" >
   <div id="jd-header" class="guide-header">
-    <span class="crumb">&nbsp;</span>
+    <span class="crumb">
+      <?cs if:parent.link ?>
+        <a href="<?cs var:parent.link ?>"><?cs var:parent.title ?></a> >
+      <?cs else ?>&nbsp;
+      <?cs /if ?>
+    </span>
     <h1><?cs var:page.title ?></h1>
   </div>
 
diff --git a/tools/droiddoc/templates/doctype.cs b/tools/droiddoc/templates/doctype.cs
index 643f992..763b073 100644
--- a/tools/droiddoc/templates/doctype.cs
+++ b/tools/droiddoc/templates/doctype.cs
@@ -1 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
\ No newline at end of file
+<!DOCTYPE html>
\ No newline at end of file