From da6de215a673e31ff23bbef0790ff93fb177eed2 Mon Sep 17 00:00:00 2001
From: Sebastien Deleuze <sdeleuze@pivotal.io>
Date: Wed, 13 Feb 2019 17:21:04 +0100
Subject: [PATCH 1/2] Add a link to SpringMockK in the Kotlin documentation

See gh-15943
---
 .../src/main/asciidoc/spring-boot-features.adoc             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index 4d3abe591c..b70dc6aaa2 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -8610,6 +8610,12 @@ documentation] for more details. You also need to
 {junit5-documentation}/#writing-tests-test-instance-lifecycle-changing-default[switch test
 instance lifecycle to "per-class"].
 
+For mocking Kotlin classes, using https://mockk.io/[Mockk] is recommended. If you need the
+Mockk equivalent of the Mockito specific
+<<boot-features-testing-spring-boot-applications-mocking-beans,`@MockBean` and `@SpyBean` annotations>>,
+you can use https://github.com/Ninja-Squad/springmockk[SpringMockK] which provides similar `@MockkBean`
+and `@SpykBean` annotations.
+
 
 
 [[boot-features-kotlin-resources]]

From cd322d7b9ce2a32c505fa9f3ea332f3c85905b29 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 14 Feb 2019 15:22:02 +0100
Subject: [PATCH 2/2] Polish "Add a link to SpringMockK in the Kotlin
 documentation"

Closes gh-15943
---
 .../src/main/asciidoc/spring-boot-features.adoc        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index b70dc6aaa2..1dd46b2385 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -8610,11 +8610,11 @@ documentation] for more details. You also need to
 {junit5-documentation}/#writing-tests-test-instance-lifecycle-changing-default[switch test
 instance lifecycle to "per-class"].
 
-For mocking Kotlin classes, using https://mockk.io/[Mockk] is recommended. If you need the
-Mockk equivalent of the Mockito specific
-<<boot-features-testing-spring-boot-applications-mocking-beans,`@MockBean` and `@SpyBean` annotations>>,
-you can use https://github.com/Ninja-Squad/springmockk[SpringMockK] which provides similar `@MockkBean`
-and `@SpykBean` annotations.
+To mock Kotlin classes, https://mockk.io/[Mockk] is recommended. If you need the `Mockk`
+equivalent of the Mockito specific
+<<boot-features-testing-spring-boot-applications-mocking-beans,`@MockBean` and `@SpyBean`
+annotations>>, you can use https://github.com/Ninja-Squad/springmockk[SpringMockK] which
+provides similar `@MockkBean` and `@SpykBean` annotations.