From 00c8b625b547dd01e8038a3b70a62514983c6974 Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Mon, 9 Sep 2019 12:42:49 +0200
Subject: Update README for Android plugin

---
 README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f3462dd1..9a9fb2d1 100644
--- a/README.md
+++ b/README.md
@@ -346,7 +346,8 @@ If you encounter any problems, please see the [FAQ](https://github.com/Kotlin/do
 
 #### Android
 
-If you are using Android there is a separate Gradle plugin. Just make sure you apply the plugin after
+Since version 0.10.0 the separate Android plugin is merged with the default one. 
+Just make sure you apply the plugin after
 `com.android.library` and `kotlin-android`.
 
 ```groovy
@@ -355,7 +356,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${dokka_version}"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}"
     }
 }
 repositories {
@@ -363,9 +364,11 @@ repositories {
 }
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'org.jetbrains.dokka-android'
+apply plugin: 'org.jetbrains.dokka'
 ```
 
+There is also a `noAndroidSdkLink` configuration parameter that works similar to `noJdkLink` and `noStdlibLink`
+
 ### Using the Maven plugin
 
 The Maven plugin does not support multiplatform projects.
-- 
cgit