diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-16 19:15:57 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-16 19:15:57 +0100 |
| commit | 0f7f49d4828b618d0f5ea0475d15f7498b61f6de (patch) | |
| tree | f6effbb2696cf8c4c79e7e3ce21cb36182c9db56 /test | |
| parent | 5eab453ea82634af9b876bff26227ec2d0e753ca (diff) | |
| parent | 4591cbccbe3bd0afb9c89471c4753a7be80818d0 (diff) | |
| download | dokka-0f7f49d4828b618d0f5ea0475d15f7498b61f6de.tar.gz dokka-0f7f49d4828b618d0f5ea0475d15f7498b61f6de.tar.bz2 dokka-0f7f49d4828b618d0f5ea0475d15f7498b61f6de.zip | |
Merge branch 'page-titles'
Conflicts:
src/Formats/HtmlFormatService.kt
Diffstat (limited to 'test')
| -rw-r--r-- | test/data/format/classWithClassObject.html | 1 | ||||
| -rw-r--r-- | test/data/format/deprecated.package.html | 1 | ||||
| -rw-r--r-- | test/data/format/htmlEscaping.html | 1 | ||||
| -rw-r--r-- | test/data/format/overloads.html | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/test/data/format/classWithClassObject.html b/test/data/format/classWithClassObject.html index 79546418..5ccb5b7e 100644 --- a/test/data/format/classWithClassObject.html +++ b/test/data/format/classWithClassObject.html @@ -1,5 +1,6 @@ <HTML> <HEAD> +<title>test / Klass</title> </HEAD> <BODY> <a href="out.html">test</a> / <a href="out.html"></a> / <a href="out.html">Klass</a><br/> diff --git a/test/data/format/deprecated.package.html b/test/data/format/deprecated.package.html index cf563a8b..13a5edb2 100644 --- a/test/data/format/deprecated.package.html +++ b/test/data/format/deprecated.package.html @@ -1,5 +1,6 @@ <HTML> <HEAD> +<title>test / root package</title> </HEAD> <BODY> <a href="out.html">test</a> / <a href="out.html"></a><br/> diff --git a/test/data/format/htmlEscaping.html b/test/data/format/htmlEscaping.html index 4f1409c4..0767d642 100644 --- a/test/data/format/htmlEscaping.html +++ b/test/data/format/htmlEscaping.html @@ -1,5 +1,6 @@ <HTML> <HEAD> +<title>test / x</title> </HEAD> <BODY> <a href="out.html">test</a> / <a href="out.html"></a> / <a href="out.html">x</a><br/> diff --git a/test/data/format/overloads.html b/test/data/format/overloads.html index 9ea88869..92296825 100644 --- a/test/data/format/overloads.html +++ b/test/data/format/overloads.html @@ -1,5 +1,6 @@ <HTML> <HEAD> +<title>test / root package</title> </HEAD> <BODY> <a href="out.html">test</a> / <a href="out.html"></a><br/> |