Merge branch '2.1.x'

spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc

@@ -2627,7 +2627,7 @@ There are several options for hot reloading. The recommended approach is to use
 additional development-time features, such as support for fast application restarts
 and LiveReload as well as sensible development-time configuration (such as template
 caching). Devtools works by monitoring the classpath for changes. This means that static
-resource changes must be "built" for the change to take affect. By default, this happens
+resource changes must be "built" for the change to take effect. By default, this happens
 automatically in Eclipse when you save your changes. In IntelliJ IDEA, the Make Project
 command triggers the necessary build. Due to the
 <<using-spring-boot.adoc#using-boot-devtools-restart-exclude, default restart

spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -8708,7 +8708,7 @@ documentation] for more details. You also need to
 {junit5-documentation}/#writing-tests-test-instance-lifecycle-changing-default[switch test
 instance lifecycle to "per-class"].
 
-To mock Kotlin classes, https://mockk.io/[Mockk] is recommended. If you need the `Mockk`
+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

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/NoSuchMethodFailureAnalyzerTests.java

@@ -44,7 +44,6 @@ public class NoSuchMethodFailureAnalyzerTests {
 		assertThat(failure).isNotNull();
 		FailureAnalysis analysis = new NoSuchMethodFailureAnalyzer().analyze(failure);
 		assertThat(analysis).isNotNull();
-		System.out.println(analysis.getDescription());
 		assertThat(analysis.getDescription())
 				.contains(NoSuchMethodFailureAnalyzerTests.class.getName()
 						+ ".createFailure(")

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/README.adoc

@@ -31,7 +31,7 @@ Next, add your user to the `docker` group. For example:
 $ sudo usermod -a -G docker awilkinson
 ----
 
-You may need to log out and back in again for this change to take affect and for your
+You may need to log out and back in again for this change to take effect and for your
 user to be able to connect to the daemon.