Snap for 6516196 from c2161ccff7fcb6956f44319f02aa3ec856fabe97 to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-release

Change-Id: Ia696078528f419e27bbc63b5ee4b6815f86ebd89

39 files changed, 598 insertions, 249 deletions

diff --git a/METADATA b/METADATA
index 8b9dd3b90..dfb86523a 100644
--- a/METADATA
+++ b/METADATA
@@ -7,6 +7,7 @@ third_party {
     type: GIT
     value: "https://github.com/Kotlin/dokka.git"
   }
+  license_type: NOTICE
   last_upgrade_date {
     year: 2019
     month: 7
diff --git a/busytown.gradle b/busytown.gradle
index f16d8539a..1b9a7119f 100644
--- a/busytown.gradle
+++ b/busytown.gradle
@@ -23,8 +23,16 @@ allprojects { project ->
             destinationDir destDir
             archiveName = "maven.zip"
         }
-        zipMaven.dependsOn(":runners:android-gradle-plugin:publishToDistMaven")
-        zipMaven.dependsOn(":runners:gradle-plugin:publishToDistMaven")
-        zipMaven.dependsOn(":runners:fatjar:publishToDistMaven")
+
+        def copyRepository = project.tasks.create("copyRepository", Copy) {
+            from file("${project.buildDir}/dist-maven")
+            into "${destDir}/repository"
+        }
+
+        [copyRepository, zipMaven].forEach {
+            it.dependsOn(":runners:android-gradle-plugin:publishToDistMaven")
+            it.dependsOn(":runners:gradle-plugin:publishToDistMaven")
+            it.dependsOn(":runners:fatjar:publishToDistMaven")
+        }
     }
 }
diff --git a/busytown.sh b/busytown.sh
index d99bdfe91..ca1ae6199 100755
--- a/busytown.sh
+++ b/busytown.sh
@@ -3,4 +3,4 @@ set -e
 
 SCRIPT_DIR="$(cd $(dirname $0) && pwd)"
 
-"$SCRIPT_DIR"/gradlew -p "$SCRIPT_DIR" -I "$SCRIPT_DIR"/busytown.gradle --no-daemon :core:build :runners:android-gradle-plugin:build :runners:gradle-integration-tests:build zipMaven
\ No newline at end of file
+"$SCRIPT_DIR"/gradlew -p "$SCRIPT_DIR" -I "$SCRIPT_DIR"/busytown.gradle --no-daemon :core:build :runners:android-gradle-plugin:build :runners:gradle-integration-tests:build zipMaven copyRepository
\ No newline at end of file
diff --git a/core/src/main/kotlin/Formats/DacHtmlFormat.kt b/core/src/main/kotlin/Formats/DacHtmlFormat.kt
index 6b42dad19..7038a7fbe 100644
--- a/core/src/main/kotlin/Formats/DacHtmlFormat.kt
+++ b/core/src/main/kotlin/Formats/DacHtmlFormat.kt
@@ -9,7 +9,6 @@ import org.jetbrains.dokka.Kotlin.ParameterInfoNode
 import org.jetbrains.dokka.Utilities.firstSentence
 import java.lang.Math.max
 import java.net.URI
-import java.util.Collections.emptyMap
 import kotlin.reflect.KClass
 
 /**
@@ -176,11 +175,25 @@ class DevsiteLayoutHtmlFormatOutputBuilder(
                                 }
                             }
                             ul(classes = "nolist") {
-                                sections.forEach {
-                                    li {
-                                        code {
-                                            metaMarkup(it.children)
+                                sections.filter {it.tag == "See Also"}.forEach {
+                                    it.children.forEach { child ->
+                                        if (child is ContentNodeLazyLink || child is ContentExternalLink) {
+                                            li {
+                                                code {
+                                                    contentNodeToMarkup(child) // Wrap bare links in listItems.
+                                                } // bare links come from the java-to-kotlin parser.
+                                            }
                                         }
+                                        else if (child is ContentUnorderedList) {
+                                            metaMarkup(child.children) // Already wrapped in listItems.
+                                        } // this is how we want things to look. No parser currently does this (yet).
+                                        else if (child is ContentParagraph) {
+                                            li{
+                                                code {
+                                                    metaMarkup (child.children) // Replace paragraphs with listItems.
+                                                } // paragraph-wrapped links come from the kotlin parser
+                                            }
+                                        } // NOTE: currently the java-to-java parser does not add See Also links!
                                     }
                                 }
                             }
@@ -467,7 +480,7 @@ class DevsiteLayoutHtmlFormatOutputBuilder(
             id = summaryId
             tbody {
                 if (headerAsRow) {
-                    developerHeading(header, summaryId)
+                    developerHeading(header)
                 }
                 nodes.forEach { node ->
                     row(node)
@@ -905,25 +918,11 @@ class DevsiteLayoutHtmlFormatOutputBuilder(
     }
 }
 
-fun TBODY.developerHeading(
-    header: String,
-    summaryId: String? = null
-) {
+fun TBODY.developerHeading(header: String) {
     tr {
         th {
             attributes["colSpan"] = "2"
-            dheading {
-                attributes["ds-is"] = "heading"
-                attributes["text"] = header
-                attributes["id"] = summaryId ?: header.replace("\\s".toRegex(), "-").toLowerCase()
-                attributes["level"] = "h3"
-                attributes["toc"] = ""
-                attributes["class"] = ""
-                h3 {
-                    attributes["is-upgraded"] = ""
-                    +header
-                }
-            }
+            +header
         }
     }
 }
@@ -947,8 +946,3 @@ class DacAsJavaFormatDescriptor : JavaLayoutHtmlFormatDescriptorBase(), DefaultA
     override val packageListServiceClass: KClass<out PackageListService> = JavaLayoutHtmlPackageListService::class
     override val outputBuilderFactoryClass: KClass<out JavaLayoutHtmlFormatOutputBuilderFactory> = DevsiteLayoutHtmlFormatOutputBuilderFactoryImpl::class
 }
-
-fun FlowOrPhrasingContent.dheading(block : DHEADING.() -> Unit = {}) : Unit = DHEADING(consumer).visit(block)
-
-class DHEADING(consumer: TagConsumer<*>) :
-    HTMLTag("devsite-heading", consumer, emptyMap(), inlineTag = false, emptyTag = false), HtmlBlockTag
diff --git a/core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt b/core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt
index 7fbdb1819..23cb81a1a 100644
--- a/core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt
+++ b/core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt
@@ -51,7 +51,7 @@ open class JavaLayoutHtmlFormatOutputBuilder(
     protected fun FlowContent.contentNodesToMarkup(content: List<ContentNode>, contextUri: URI = uri): Unit =
         content.forEach { contentNodeToMarkup(it, contextUri) }
 
-    private fun FlowContent.contentNodeToMarkup(content: ContentNode, contextUri: URI) {
+    protected fun FlowContent.contentNodeToMarkup(content: ContentNode, contextUri: URI = uri) {
         when (content) {
             is ContentText -> +content.text
             is ContentSymbol -> span("symbol") { +content.text }
@@ -136,7 +136,7 @@ open class JavaLayoutHtmlFormatOutputBuilder(
             }
             ContentHardLineBreak -> br
 
-            is ContentParagraph -> p { contentNodesToMarkup(content.children, contextUri) }
+            is ContentParagraph -> p(classes = content.label) { contentNodesToMarkup(content.children, contextUri) }
 
             is NodeRenderContent -> renderedSignature(content.node, mode = content.mode)
             is ContentNodeLink -> {
@@ -884,7 +884,7 @@ open class JavaLayoutHtmlFormatOutputBuilder(
         emphasis: Boolean = true): ContentNode? {
         val deprecated = node.deprecation
         deprecated?.let {
-            return ContentParagraph().apply {
+            return ContentParagraph("caution").apply {
                 if (prefix) {
                     append(ContentStrong().apply { text(
                         if (deprecated.content.children.size == 0) "Deprecated."
diff --git a/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt b/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
index 8776da4c2..ed4d36687 100644
--- a/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
+++ b/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
@@ -209,20 +209,8 @@ class JavaPsiDocumentationBuilder : JavaDocumentationBuilder {
         superTypes.filter { !ignoreSupertype(it) }.forEach { superType ->
             node.appendType(superType, NodeKind.Supertype)
             val superClass = superType.resolve()
-            // parentNode is the actual DocumentationNode of this class's supertype
-            // It is necessary to create documentation links back to the superclass from inherited methods
-            val parentNode = refGraph.lookup(superType.typeSignature())
-            if (superClass != null && parentNode != null) {
+            if (superClass != null) {
                 link(superClass, node, RefKind.Inheritor)
-                // Explicitly add the methods of the superclass (which are not overridden) as nodes to this class
-                val overriddenMethods = methods.toList().flatMap { it.findSuperMethods().toList() }
-                val inheritedMethods = superClass.methods.filter { it !in overriddenMethods }.toTypedArray()
-
-                node.appendChildren(inheritedMethods, RefKind.InheritedMember) {
-                    val child = build()
-                    child.addReferenceTo(parentNode, RefKind.Owner)
-                    return@appendChildren child
-                }
             }
         }
 
diff --git a/core/src/main/kotlin/Model/Content.kt b/core/src/main/kotlin/Model/Content.kt
index f239da7f9..a4c78fabf 100644
--- a/core/src/main/kotlin/Model/Content.kt
+++ b/core/src/main/kotlin/Model/Content.kt
@@ -106,7 +106,7 @@ object ContentIndentedSoftLineBreak: ContentNode {
 }
 class ScriptBlock(val type: String?, val src: String) : ContentBlock()
 
-class ContentParagraph() : ContentBlock()
+class ContentParagraph(val label: String? = null) : ContentBlock()
 class ContentEmphasis() : ContentBlock()
 class ContentStrong() : ContentBlock()
 class ContentStrikethrough() : ContentBlock()
diff --git a/core/src/test/kotlin/format/DacFormatTest.kt b/core/src/test/kotlin/format/DacFormatTest.kt
index ae17420d4..5d8babc3d 100644
--- a/core/src/test/kotlin/format/DacFormatTest.kt
+++ b/core/src/test/kotlin/format/DacFormatTest.kt
@@ -51,4 +51,8 @@ class DacFormatTest: DacFormatTestCase() {
     @Test fun javaClassLinks() {
         verifyBothFormats("javaClassLinks")
     }
+
+    @Test fun deprecation() {
+        verifyBothFormats("deprecation")
+    }
 }
\ No newline at end of file
diff --git a/core/testdata/format/dac/deprecation/DeprecatedBar.kt b/core/testdata/format/dac/deprecation/DeprecatedBar.kt
new file mode 100644
index 000000000..8eb729299
--- /dev/null
+++ b/core/testdata/format/dac/deprecation/DeprecatedBar.kt
@@ -0,0 +1,17 @@
+class Bar {
+    fun replacementBarMethod(): Bar { return Bar() }
+
+    fun badBarMethod(): DeprecatedBar { return DeprecatedBar() }
+
+    /**
+     * @deprecated Use {@link #replacementBarMethod()} instead.
+     */
+    @Deprecated
+    fun goodBarMethod(): DeprecatedBar { return DeprecatedBar() }
+}
+
+/**
+ * @deprecated Use {@link #Bar} instead.
+ */
+@Deprecated
+class DeprecatedBar
\ No newline at end of file
diff --git a/core/testdata/format/dac/deprecation/DeprecatedFoo.java b/core/testdata/format/dac/deprecation/DeprecatedFoo.java
new file mode 100644
index 000000000..3c9c360ee
--- /dev/null
+++ b/core/testdata/format/dac/deprecation/DeprecatedFoo.java
@@ -0,0 +1,21 @@
+public class Foo {
+    public Foo() { }
+
+    public static Foo replacementFooMethod() { return Foo() }
+
+    public static DeprecatedFoo badFooMethod() { return new DeprecatedFoo() }
+
+    /**
+     * @deprecated Use {@link #replacementFooMethod()} instead.
+     */
+    @Deprecated
+    public static DeprecatedFoo goodFooMethod() { return new DeprecatedFoo() }
+}
+
+/**
+ * @deprecated Use {@link #Foo} instead.
+ */
+@Deprecated
+public class DeprecatedFoo {
+    public DeprecatedFoo() { }
+}
diff --git a/core/testdata/format/dac/deprecation/dac-as-java/Bar.html b/core/testdata/format/dac/deprecation/dac-as-java/Bar.html
new file mode 100644
index 000000000..d77fa9e64
--- /dev/null
+++ b/core/testdata/format/dac/deprecation/dac-as-java/Bar.html
@@ -0,0 +1,82 @@
+<html devsite="true">
+  <head>
+    <title>Bar</title>
+{% setvar book_path %}/_book.yaml{% endsetvar %}
+{% include "_shared/_reference-head-tags.html" %}
+  </head>
+  <body>
+    <div id="api-info-block"></div>
+    <h1>Bar</h1>
+    <pre><span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> <span class="identifier">Bar</span> <span class="keyword">implements</span> <span class="identifier">java.lang.Object</span></pre>
+    <table class="jd-inheritance-table">
+      <tr>
+        <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">Bar</a></td>
+      </tr>
+    </table>
+    <h2>Summary</h2>
+    <table class="responsive" id="pubctors">
+      <tbody>
+        <tr>
+          <th colSpan="2">Public constructors</th>
+        </tr>
+        <tr>
+          <td>
+            <div><code><a href="#Bar()">Bar</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <table class="responsive" id="pubmethods">
+      <tbody>
+        <tr>
+          <th colSpan="2">Public methods</th>
+        </tr>
+        <tr>
+          <td><span class="keyword">final</span> <a href="DeprecatedBar.html#"><span class="identifier">DeprecatedBar</span></a></td>
+          <td>
+            <div><code><a href="#badBarMethod()">badBarMethod</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+        <tr>
+          <td><span class="keyword">final</span> <a href="DeprecatedBar.html#"><span class="identifier">DeprecatedBar</span></a></td>
+          <td>
+            <div><code><a href="#goodBarMethod()">goodBarMethod</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+        <tr>
+          <td><span class="keyword">final</span> <a href="#"><span class="identifier">Bar</span></a></td>
+          <td>
+            <div><code><a href="#replacementBarMethod()">replacementBarMethod</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <h2>Public constructors</h2>
+<a name="Bar()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">Bar</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+    </div>
+    <h2>Public methods</h2>
+<a name="badBarMethod()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">badBarMethod</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="keyword">final</span> <a href="DeprecatedBar.html#"><span class="identifier">DeprecatedBar</span></a> <span class="identifier">badBarMethod</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+    </div>
+<a name="goodBarMethod()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">goodBarMethod</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="keyword">final</span> <a href="DeprecatedBar.html#"><span class="identifier">DeprecatedBar</span></a> <span class="identifier">goodBarMethod</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+      <p class="caution"><strong>Deprecated: </strong><em>Deprecated</em></p>
+    </div>
+<a name="replacementBarMethod()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">replacementBarMethod</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="keyword">final</span> <a href="#"><span class="identifier">Bar</span></a> <span class="identifier">replacementBarMethod</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+    </div>
+  </body>
+</html>
diff --git a/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedBar.html b/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedBar.html
new file mode 100644
index 000000000..56283f6e5
--- /dev/null
+++ b/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedBar.html
@@ -0,0 +1,37 @@
+<html devsite="true">
+  <head>
+    <title>DeprecatedBar</title>
+{% setvar book_path %}/_book.yaml{% endsetvar %}
+{% include "_shared/_reference-head-tags.html" %}
+  </head>
+  <body>
+    <div id="api-info-block"></div>
+    <h1>DeprecatedBar</h1>
+    <pre><span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> <span class="identifier">DeprecatedBar</span> <span class="keyword">implements</span> <span class="identifier">java.lang.Object</span></pre>
+    <table class="jd-inheritance-table">
+      <tr>
+        <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">DeprecatedBar</a></td>
+      </tr>
+    </table>
+    <h2>Summary</h2>
+    <table class="responsive" id="pubctors">
+      <tbody>
+        <tr>
+          <th colSpan="2">Public constructors</th>
+        </tr>
+        <tr>
+          <td>
+            <div><code><a href="#DeprecatedBar()">DeprecatedBar</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <h2>Public constructors</h2>
+<a name="DeprecatedBar()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">DeprecatedBar</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">DeprecatedBar</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+    </div>
+  </body>
+</html>
diff --git a/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedFoo.html b/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedFoo.html
new file mode 100644
index 000000000..e7e2fecb0
--- /dev/null
+++ b/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedFoo.html
@@ -0,0 +1,37 @@
+<html devsite="true">
+  <head>
+    <title>DeprecatedFoo</title>
+{% setvar book_path %}/_book.yaml{% endsetvar %}
+{% include "_shared/_reference-head-tags.html" %}
+  </head>
+  <body>
+    <div id="api-info-block"></div>
+    <h1>DeprecatedFoo</h1>
+    <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">DeprecatedFoo</span> <span class="keyword">implements</span> <span class="identifier">java.lang.Object</span></pre>
+    <table class="jd-inheritance-table">
+      <tr>
+        <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">DeprecatedFoo</a></td>
+      </tr>
+    </table>
+    <h2>Summary</h2>
+    <table class="responsive" id="pubctors">
+      <tbody>
+        <tr>
+          <th colSpan="2">Public constructors</th>
+        </tr>
+        <tr>
+          <td>
+            <div><code><a href="#DeprecatedFoo()">DeprecatedFoo</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <h2>Public constructors</h2>
+<a name="DeprecatedFoo()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">DeprecatedFoo</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">DeprecatedFoo</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+    </div>
+  </body>
+</html>
diff --git a/core/testdata/format/dac/deprecation/dac-as-java/Foo.html b/core/testdata/format/dac/deprecation/dac-as-java/Foo.html
new file mode 100644
index 000000000..c898800da
--- /dev/null
+++ b/core/testdata/format/dac/deprecation/dac-as-java/Foo.html
@@ -0,0 +1,82 @@
+<html devsite="true">
+  <head>
+    <title>Foo</title>
+{% setvar book_path %}/_book.yaml{% endsetvar %}
+{% include "_shared/_reference-head-tags.html" %}
+  </head>
+  <body>
+    <div id="api-info-block"></div>
+    <h1>Foo</h1>
+    <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Foo</span> <span class="keyword">implements</span> <span class="identifier">java.lang.Object</span></pre>
+    <table class="jd-inheritance-table">
+      <tr>
+        <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">Foo</a></td>
+      </tr>
+    </table>
+    <h2>Summary</h2>
+    <table class="responsive" id="pubctors">
+      <tbody>
+        <tr>
+          <th colSpan="2">Public constructors</th>
+        </tr>
+        <tr>
+          <td>
+            <div><code><a href="#Foo()">Foo</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <table class="responsive" id="pubmethods">
+      <tbody>
+        <tr>
+          <th colSpan="2">Public methods</th>
+        </tr>
+        <tr>
+          <td><span class="keyword">static</span> <a href="DeprecatedFoo.html#"><span class="identifier">DeprecatedFoo</span></a></td>
+          <td>
+            <div><code><a href="#badFooMethod()">badFooMethod</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+        <tr>
+          <td><span class="keyword">static</span> <a href="DeprecatedFoo.html#"><span class="identifier">DeprecatedFoo</span></a></td>
+          <td>
+            <div><code><a href="#goodFooMethod()">goodFooMethod</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+        <tr>
+          <td><span class="keyword">static</span> <a href="#"><span class="identifier">Foo</span></a></td>
+          <td>
+            <div><code><a href="#replacementFooMethod()">replacementFooMethod</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <h2>Public constructors</h2>
+<a name="Foo()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">Foo</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+    </div>
+    <h2>Public methods</h2>
+<a name="badFooMethod()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">badFooMethod</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="keyword">static</span> <a href="DeprecatedFoo.html#"><span class="identifier">DeprecatedFoo</span></a> <span class="identifier">badFooMethod</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+    </div>
+<a name="goodFooMethod()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">goodFooMethod</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="keyword">static</span> <a href="DeprecatedFoo.html#"><span class="identifier">DeprecatedFoo</span></a> <span class="identifier">goodFooMethod</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+      <p class="caution"><strong>Deprecated.</strong><em></em></p>
+    </div>
+<a name="replacementFooMethod()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">replacementFooMethod</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="keyword">static</span> <a href="#"><span class="identifier">Foo</span></a> <span class="identifier">replacementFooMethod</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+    </div>
+  </body>
+</html>
diff --git a/core/testdata/format/dac/deprecation/dac/Bar.html b/core/testdata/format/dac/deprecation/dac/Bar.html
new file mode 100644
index 000000000..f20112e16
--- /dev/null
+++ b/core/testdata/format/dac/deprecation/dac/Bar.html
@@ -0,0 +1,82 @@
+<html devsite="true">
+  <head>
+    <title>Bar</title>
+{% setvar book_path %}/_book.yaml{% endsetvar %}
+{% include "_shared/_reference-head-tags.html" %}
+  </head>
+  <body>
+    <div id="api-info-block"></div>
+    <h1>Bar</h1>
+    <pre><span class="keyword">class </span><span class="identifier">Bar</span></pre>
+    <table class="jd-inheritance-table">
+      <tr>
+        <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">Bar</a></td>
+      </tr>
+    </table>
+    <h2>Summary</h2>
+    <table class="responsive" id="pubctors">
+      <tbody>
+        <tr>
+          <th colSpan="2">Public constructors</th>
+        </tr>
+        <tr>
+          <td>
+            <div><code><a href="#%3Cinit%3E()">&lt;init&gt;</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <table class="responsive" id="pubmethods">
+      <tbody>
+        <tr>
+          <th colSpan="2">Public methods</th>
+        </tr>
+        <tr>
+          <td><a href="DeprecatedBar.html#"><span class="identifier">DeprecatedBar</span></a></td>
+          <td>
+            <div><code><a href="#badBarMethod()">badBarMethod</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+        <tr>
+          <td><a href="DeprecatedBar.html#"><span class="identifier">DeprecatedBar</span></a></td>
+          <td>
+            <div><code><a href="#goodBarMethod()">goodBarMethod</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+        <tr>
+          <td><a href="#"><span class="identifier">Bar</span></a></td>
+          <td>
+            <div><code><a href="#replacementBarMethod()">replacementBarMethod</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <h2>Public constructors</h2>
+<a name="%3Cinit%3E()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">&lt;init&gt;</h3>
+      <pre class="api-signature no-pretty-print"><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+    </div>
+    <h2>Public methods</h2>
+<a name="badBarMethod()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">badBarMethod</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">fun </span><span class="identifier">badBarMethod</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="DeprecatedBar.html#"><span class="identifier">DeprecatedBar</span></a></pre>
+    </div>
+<a name="goodBarMethod()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">goodBarMethod</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">fun </span><del><span class="identifier">goodBarMethod</span></del><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="DeprecatedBar.html#"><span class="identifier">DeprecatedBar</span></a></pre>
+      <p class="caution"><strong>Deprecated.</strong><em></em></p>
+    </div>
+<a name="replacementBarMethod()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">replacementBarMethod</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">fun </span><span class="identifier">replacementBarMethod</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="#"><span class="identifier">Bar</span></a></pre>
+    </div>
+  </body>
+</html>
diff --git a/core/testdata/format/dac/deprecation/dac/DeprecatedBar.html b/core/testdata/format/dac/deprecation/dac/DeprecatedBar.html
new file mode 100644
index 000000000..15be9a06e
--- /dev/null
+++ b/core/testdata/format/dac/deprecation/dac/DeprecatedBar.html
@@ -0,0 +1,37 @@
+<html devsite="true">
+  <head>
+    <title>DeprecatedBar</title>
+{% setvar book_path %}/_book.yaml{% endsetvar %}
+{% include "_shared/_reference-head-tags.html" %}
+  </head>
+  <body>
+    <div id="api-info-block"></div>
+    <h1>DeprecatedBar</h1>
+    <pre><span class="keyword">class </span><del><span class="identifier">DeprecatedBar</span></del></pre>
+    <table class="jd-inheritance-table">
+      <tr>
+        <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">DeprecatedBar</a></td>
+      </tr>
+    </table>
+    <h2>Summary</h2>
+    <table class="responsive" id="pubctors">
+      <tbody>
+        <tr>
+          <th colSpan="2">Public constructors</th>
+        </tr>
+        <tr>
+          <td>
+            <div><code><a href="#%3Cinit%3E()">&lt;init&gt;</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <h2>Public constructors</h2>
+<a name="%3Cinit%3E()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">&lt;init&gt;</h3>
+      <pre class="api-signature no-pretty-print"><span class="identifier">DeprecatedBar</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+    </div>
+  </body>
+</html>
diff --git a/core/testdata/format/dac/deprecation/dac/DeprecatedFoo.html b/core/testdata/format/dac/deprecation/dac/DeprecatedFoo.html
new file mode 100644
index 000000000..610c46b60
--- /dev/null
+++ b/core/testdata/format/dac/deprecation/dac/DeprecatedFoo.html
@@ -0,0 +1,37 @@
+<html devsite="true">
+  <head>
+    <title>DeprecatedFoo</title>
+{% setvar book_path %}/_book.yaml{% endsetvar %}
+{% include "_shared/_reference-head-tags.html" %}
+  </head>
+  <body>
+    <div id="api-info-block"></div>
+    <h1>DeprecatedFoo</h1>
+    <pre><span class="keyword">open</span> <span class="keyword">class </span><del><span class="identifier">DeprecatedFoo</span></del></pre>
+    <table class="jd-inheritance-table">
+      <tr>
+        <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">DeprecatedFoo</a></td>
+      </tr>
+    </table>
+    <h2>Summary</h2>
+    <table class="responsive" id="pubctors">
+      <tbody>
+        <tr>
+          <th colSpan="2">Public constructors</th>
+        </tr>
+        <tr>
+          <td>
+            <div><code><a href="#%3Cinit%3E()">&lt;init&gt;</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <h2>Public constructors</h2>
+<a name="%3Cinit%3E()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">&lt;init&gt;</h3>
+      <pre class="api-signature no-pretty-print"><span class="identifier">DeprecatedFoo</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+    </div>
+  </body>
+</html>
diff --git a/core/testdata/format/dac/deprecation/dac/Foo.html b/core/testdata/format/dac/deprecation/dac/Foo.html
new file mode 100644
index 000000000..76c0760a0
--- /dev/null
+++ b/core/testdata/format/dac/deprecation/dac/Foo.html
@@ -0,0 +1,82 @@
+<html devsite="true">
+  <head>
+    <title>Foo</title>
+{% setvar book_path %}/_book.yaml{% endsetvar %}
+{% include "_shared/_reference-head-tags.html" %}
+  </head>
+  <body>
+    <div id="api-info-block"></div>
+    <h1>Foo</h1>
+    <pre><span class="keyword">open</span> <span class="keyword">class </span><span class="identifier">Foo</span></pre>
+    <table class="jd-inheritance-table">
+      <tr>
+        <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">Foo</a></td>
+      </tr>
+    </table>
+    <h2>Summary</h2>
+    <table class="responsive" id="pubctors">
+      <tbody>
+        <tr>
+          <th colSpan="2">Public constructors</th>
+        </tr>
+        <tr>
+          <td>
+            <div><code><a href="#%3Cinit%3E()">&lt;init&gt;</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <table class="responsive" id="pubmethods">
+      <tbody>
+        <tr>
+          <th colSpan="2">Public methods</th>
+        </tr>
+        <tr>
+          <td><span class="keyword">open</span> <span class="keyword">static</span> <a href="DeprecatedFoo.html#"><span class="identifier">DeprecatedFoo</span></a><span class="symbol">!</span></td>
+          <td>
+            <div><code><a href="#badFooMethod()">badFooMethod</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+        <tr>
+          <td><span class="keyword">open</span> <span class="keyword">static</span> <a href="DeprecatedFoo.html#"><span class="identifier">DeprecatedFoo</span></a><span class="symbol">!</span></td>
+          <td>
+            <div><code><a href="#goodFooMethod()">goodFooMethod</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+        <tr>
+          <td><span class="keyword">open</span> <span class="keyword">static</span> <a href="#"><span class="identifier">Foo</span></a><span class="symbol">!</span></td>
+          <td>
+            <div><code><a href="#replacementFooMethod()">replacementFooMethod</a>()</code></div>
+            <p></p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <h2>Public constructors</h2>
+<a name="%3Cinit%3E()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">&lt;init&gt;</h3>
+      <pre class="api-signature no-pretty-print"><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+    </div>
+    <h2>Public methods</h2>
+<a name="badFooMethod()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">badFooMethod</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">open</span> <span class="keyword">static</span> <span class="keyword">fun </span><span class="identifier">badFooMethod</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="DeprecatedFoo.html#"><span class="identifier">DeprecatedFoo</span></a><span class="symbol">!</span></pre>
+    </div>
+<a name="goodFooMethod()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">goodFooMethod</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">open</span> <span class="keyword">static</span> <span class="keyword">fun </span><del><span class="identifier">goodFooMethod</span></del><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="DeprecatedFoo.html#"><span class="identifier">DeprecatedFoo</span></a><span class="symbol">!</span></pre>
+      <p class="caution"><strong>Deprecated: </strong><em>Use <code><a href="#replacementFooMethod()">replacementFooMethod()</a></code> instead.</em></p>
+    </div>
+<a name="replacementFooMethod()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">replacementFooMethod</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">open</span> <span class="keyword">static</span> <span class="keyword">fun </span><span class="identifier">replacementFooMethod</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="#"><span class="identifier">Foo</span></a><span class="symbol">!</span></pre>
+    </div>
+  </body>
+</html>
diff --git a/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html b/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html
index 65e2addb0..67a58125a 100644
--- a/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html
+++ b/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html
@@ -21,11 +21,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -38,11 +34,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="identifier">void</span></td>
@@ -60,35 +52,6 @@
         </tr>
       </tbody>
     </table>
-    <table class="responsive" id="inhmethods">
-      <tbody>
-        <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Inherited functions" id="inherited-functions" level="h3" toc="" class="">
-              <h3 is-upgraded="">Inherited functions</h3>
-            </devsite-heading>
-          </th>
-        </tr>
-        <tr class="api apilevel-">
-          <td colSpan="2">
-            <div class="expandable jd-inherited-apis"><span class="expand-control exw-expanded">From class <code><a href="Parent.html#">Parent</a></code></span>
-              <table class="responsive exw-expanded-content">
-                <tbody>
-                  <tr class="api apilevel-" data-version-added="ApiLevel:">
-                    <td><code><span class="identifier">void</span></code></td>
-                    <td width="100%"><code><a href="Parent.html#foo()">foo</a>()</code>
-                      <p>
-                        <p>Do a superclass foo</p>
-                      </p>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
-            </div>
-          </td>
-        </tr>
-      </tbody>
-    </table>
     <h2>Public constructors</h2>
 <a name="Child()"></a>
     <div class="api apilevel-" data-version-added="">
diff --git a/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html b/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html
index 4efddeb30..dd305f7f8 100644
--- a/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html
+++ b/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html
@@ -38,11 +38,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -55,11 +51,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="identifier">void</span></td>
diff --git a/core/testdata/format/dac/inheritedMethods/dac/Child.html b/core/testdata/format/dac/inheritedMethods/dac/Child.html
index 5da7f475d..dff52afbe 100644
--- a/core/testdata/format/dac/inheritedMethods/dac/Child.html
+++ b/core/testdata/format/dac/inheritedMethods/dac/Child.html
@@ -21,11 +21,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -38,11 +34,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
@@ -63,11 +55,7 @@
     <table class="responsive" id="inhmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Inherited functions" id="inherited-functions" level="h3" toc="" class="">
-              <h3 is-upgraded="">Inherited functions</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Inherited functions</th>
         </tr>
         <tr class="api apilevel-">
           <td colSpan="2">
diff --git a/core/testdata/format/dac/inheritedMethods/dac/Parent.html b/core/testdata/format/dac/inheritedMethods/dac/Parent.html
index 0023368f0..ff9048b96 100644
--- a/core/testdata/format/dac/inheritedMethods/dac/Parent.html
+++ b/core/testdata/format/dac/inheritedMethods/dac/Parent.html
@@ -38,11 +38,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -55,11 +51,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
diff --git a/core/testdata/format/dac/javaClassLinks/dac-as-java/Bar.html b/core/testdata/format/dac/javaClassLinks/dac-as-java/Bar.html
index 3d247edb8..cbabc2920 100644
--- a/core/testdata/format/dac/javaClassLinks/dac-as-java/Bar.html
+++ b/core/testdata/format/dac/javaClassLinks/dac-as-java/Bar.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -34,11 +30,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><a href="Foo.html#"><span class="identifier">Foo</span></a></td>
diff --git a/core/testdata/format/dac/javaClassLinks/dac-as-java/Foo.html b/core/testdata/format/dac/javaClassLinks/dac-as-java/Foo.html
index 5717ecf6b..0ae4d255b 100644
--- a/core/testdata/format/dac/javaClassLinks/dac-as-java/Foo.html
+++ b/core/testdata/format/dac/javaClassLinks/dac-as-java/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/javaClassLinks/dac/Bar.html b/core/testdata/format/dac/javaClassLinks/dac/Bar.html
index 0c0c36714..87f2c3adf 100644
--- a/core/testdata/format/dac/javaClassLinks/dac/Bar.html
+++ b/core/testdata/format/dac/javaClassLinks/dac/Bar.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -34,11 +30,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="keyword">open</span> <a href="Foo.html#"><span class="identifier">Foo</span></a><span class="symbol">!</span></td>
diff --git a/core/testdata/format/dac/javaClassLinks/dac/Foo.html b/core/testdata/format/dac/javaClassLinks/dac/Foo.html
index dc7637b6a..51ba0204c 100644
--- a/core/testdata/format/dac/javaClassLinks/dac/Foo.html
+++ b/core/testdata/format/dac/javaClassLinks/dac/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/javaConstructor/dac-as-java/Foo.html b/core/testdata/format/dac/javaConstructor/dac-as-java/Foo.html
index 5717ecf6b..0ae4d255b 100644
--- a/core/testdata/format/dac/javaConstructor/dac-as-java/Foo.html
+++ b/core/testdata/format/dac/javaConstructor/dac-as-java/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/javaConstructor/dac/Foo.html b/core/testdata/format/dac/javaConstructor/dac/Foo.html
index dc7637b6a..51ba0204c 100644
--- a/core/testdata/format/dac/javaConstructor/dac/Foo.html
+++ b/core/testdata/format/dac/javaConstructor/dac/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/javaDefaultConstructor/dac-as-java/Foo.html b/core/testdata/format/dac/javaDefaultConstructor/dac-as-java/Foo.html
index 5717ecf6b..0ae4d255b 100644
--- a/core/testdata/format/dac/javaDefaultConstructor/dac-as-java/Foo.html
+++ b/core/testdata/format/dac/javaDefaultConstructor/dac-as-java/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/javaDefaultConstructor/dac/Foo.html b/core/testdata/format/dac/javaDefaultConstructor/dac/Foo.html
index dc7637b6a..51ba0204c 100644
--- a/core/testdata/format/dac/javaDefaultConstructor/dac/Foo.html
+++ b/core/testdata/format/dac/javaDefaultConstructor/dac/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/javaMethodVisibilities/dac-as-java/Foo.html b/core/testdata/format/dac/javaMethodVisibilities/dac-as-java/Foo.html
index 7f494c467..1ed04c547 100644
--- a/core/testdata/format/dac/javaMethodVisibilities/dac-as-java/Foo.html
+++ b/core/testdata/format/dac/javaMethodVisibilities/dac-as-java/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -34,11 +30,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="identifier">void</span></td>
@@ -52,11 +44,7 @@
     <table class="responsive" id="promethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Protected methods" id="promethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Protected methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Protected methods</th>
         </tr>
         <tr>
           <td><span class="identifier">void</span></td>
@@ -70,11 +58,7 @@
     <table class="responsive" id="primethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Private methods" id="primethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Private methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Private methods</th>
         </tr>
         <tr>
           <td><span class="identifier">void</span></td>
diff --git a/core/testdata/format/dac/javaMethodVisibilities/dac/Foo.html b/core/testdata/format/dac/javaMethodVisibilities/dac/Foo.html
index 3f1e45107..0bcdcae90 100644
--- a/core/testdata/format/dac/javaMethodVisibilities/dac/Foo.html
+++ b/core/testdata/format/dac/javaMethodVisibilities/dac/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -34,11 +30,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
@@ -52,11 +44,7 @@
     <table class="responsive" id="promethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Protected methods" id="promethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Protected methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Protected methods</th>
         </tr>
         <tr>
           <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
@@ -70,11 +58,7 @@
     <table class="responsive" id="primethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Private methods" id="primethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Private methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Private methods</th>
         </tr>
         <tr>
           <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
diff --git a/core/testdata/format/dac/javaSeeTag/Bar.kt b/core/testdata/format/dac/javaSeeTag/Bar.kt
index 9df671194..21170d363 100644
--- a/core/testdata/format/dac/javaSeeTag/Bar.kt
+++ b/core/testdata/format/dac/javaSeeTag/Bar.kt
@@ -1,4 +1,5 @@
 /**
  * @see Foo
+ * @see java.lang.String
  */
 class Bar
\ No newline at end of file
diff --git a/core/testdata/format/dac/javaSeeTag/Foo.java b/core/testdata/format/dac/javaSeeTag/Foo.java
index 94a24606d..b784ae225 100644
--- a/core/testdata/format/dac/javaSeeTag/Foo.java
+++ b/core/testdata/format/dac/javaSeeTag/Foo.java
@@ -1,5 +1,6 @@
 /**
  * @see #bar
+ * @see java.lang.String
  */
 public class Foo {
   public void bar() {}
diff --git a/core/testdata/format/dac/javaSeeTag/dac-as-java/Bar.html b/core/testdata/format/dac/javaSeeTag/dac-as-java/Bar.html
index 3dbc813fa..6b4d75f4a 100644
--- a/core/testdata/format/dac/javaSeeTag/dac-as-java/Bar.html
+++ b/core/testdata/format/dac/javaSeeTag/dac-as-java/Bar.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -39,9 +35,8 @@
       <div>
         <p><b>See Also</b></p>
         <ul class="nolist">
-          <li><code>
-              <p><a href="Foo.html#">Foo</a></p>
-            </code></li>
+          <li><code><a href="Foo.html#">Foo</a></code></li>
+          <li><code><a href="http://docs.oracle.com/javase/6/docs/api/java/lang/String.html">java.lang.String</a></code></li>
         </ul>
       </div>
     </div>
diff --git a/core/testdata/format/dac/javaSeeTag/dac-as-java/Foo.html b/core/testdata/format/dac/javaSeeTag/dac-as-java/Foo.html
index 6a6b5045c..b9f23dc59 100644
--- a/core/testdata/format/dac/javaSeeTag/dac-as-java/Foo.html
+++ b/core/testdata/format/dac/javaSeeTag/dac-as-java/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -34,11 +30,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="identifier">void</span></td>
diff --git a/core/testdata/format/dac/javaSeeTag/dac/Bar.html b/core/testdata/format/dac/javaSeeTag/dac/Bar.html
index b7d8304d3..10a5f59ed 100644
--- a/core/testdata/format/dac/javaSeeTag/dac/Bar.html
+++ b/core/testdata/format/dac/javaSeeTag/dac/Bar.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -39,9 +35,8 @@
       <div>
         <p><b>See Also</b></p>
         <ul class="nolist">
-          <li><code>
-              <p><a href="Foo.html#">Foo</a></p>
-            </code></li>
+          <li><code><a href="Foo.html#">Foo</a></code></li>
+          <li><code><a href="http://docs.oracle.com/javase/6/docs/api/java/lang/String.html">java.lang.String</a></code></li>
         </ul>
       </div>
     </div>
diff --git a/core/testdata/format/dac/javaSeeTag/dac/Foo.html b/core/testdata/format/dac/javaSeeTag/dac/Foo.html
index 473fd2cc2..7ca410c06 100644
--- a/core/testdata/format/dac/javaSeeTag/dac/Foo.html
+++ b/core/testdata/format/dac/javaSeeTag/dac/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -34,11 +30,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
@@ -58,6 +50,7 @@
         <p><b>See Also</b></p>
         <ul class="nolist">
           <li><code><a href="#bar()">#bar</a></code></li>
+          <li><code><a href="http://docs.oracle.com/javase/6/docs/api/java/lang/String.html">java.lang.String</a></code></li>
         </ul>
       </div>
     </div>
diff --git a/gradle.properties b/gradle.properties
index 4c10991b5..a9e47b0bc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-dokka_version=0.9.17-g009
+dokka_version=0.9.17-g011
 dokka_publication_channel=dokka
 
 #Kotlin compiler and plugin