diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt
index 2cfab23d48f..b3cca8b6179 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt
@@ -13,7 +13,7 @@ class AllClassesFrameTemplate(val model: KModel, val classAttributes: String = "
-
+$generatedComment
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt
index d2fce489e04..f8dae120bb0 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt
@@ -20,7 +20,7 @@ open class ClassTemplate(open val model: KModel, pkg: KPackage, open val klass:
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by kdoc (${model.version}) on ${Date()} -->
+$generatedComment
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<TITLE>
${pageTitle()}
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt
index 808a50ba762..0e1d8892e9a 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt
@@ -13,7 +13,7 @@ class HelpDocTemplate(val model: KModel) : KDocTemplate() {
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc on Mon Jan 09 13:32:00 EST 2012-->
+$generatedComment
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<TITLE>
API Help (${model.title})
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/IndexTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/IndexTemplate.kt
index 8c11535e993..22ffd9911f0 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/IndexTemplate.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/IndexTemplate.kt
@@ -13,7 +13,7 @@ class IndexTemplate(val model: KModel) : KDocTemplate() {
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc on Mon Jan 09 13:32:00 EST 2012-->
+$generatedComment
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<TITLE>
${model.title}
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt
index e892dfc7877..c73185b7591 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt
@@ -13,6 +13,9 @@ import org.jetbrains.kotlin.doc.model.KType
import java.util.List
abstract class KDocTemplate() : TextTemplate() {
+ // TODO: use same timestamp for all pages
+ protected val generatedComment: String = "<!-- Generated by kdoc on ${java.util.Date()} -->"
+
open fun rootHref(pkg: KPackage): String {
return if (!pkg.useExternalLink)
relativePrefix()
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt
index cf235159984..34eb421734c 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt
@@ -13,7 +13,7 @@ class OverviewFrameTemplate(val model: KModel) : KDocTemplate() {
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by kdoc (${model.version}) on ${Date()} -->
+$generatedComment
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<TITLE>
Overview List (${model.title})
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt
index 0a42fe2aaa9..400f01742d1 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt
@@ -13,7 +13,7 @@ class OverviewSummaryTemplate(val model: KModel) : KDocTemplate() {
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc on Mon Jan 09 13:32:00 EST 2012-->
+$generatedComment
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<TITLE>
Overview (${model.title})
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt
index 2e0b0188cff..392a175f21f 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt
@@ -13,7 +13,7 @@ class OverviewTreeTemplate(val model: KModel) : KDocTemplate() {
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc on Mon Jan 09 13:32:00 EST 2012-->
+$generatedComment
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<TITLE>
Class Hierarchy (${model.title})
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt
index 81a7ca8889d..05cd8a3b582 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt
@@ -18,7 +18,7 @@ class PackageFrameTemplate(val model: KModel, p: KPackage) : PackageTemplateSupp
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by kdoc (${model.version}) on ${Date()} -->
+$generatedComment
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<TITLE>
${pkg.name} (${model.title})
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt
index 67968ef9618..21eb9441067 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt
@@ -18,7 +18,7 @@ class PackageSummaryTemplate(val model: KModel, pkg: KPackage) : PackageTemplate
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by kdoc (${model.version}) on ${Date()} -->
+$generatedComment
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<TITLE>
${pkg.name} (${model.title})