Merge branch '6.2.x'

framework-docs/modules/ROOT/pages/testing/mockmvc/hamcrest/async-requests.adoc

@@ -26,16 +26,16 @@ Java::
 
 	@Test
 	void test() throws Exception {
-        MvcResult mvcResult = this.mockMvc.perform(get("/path"))
-                .andExpect(status().isOk()) <1>
-                .andExpect(request().asyncStarted()) <2>
-                .andExpect(request().asyncResult("body")) <3>
-                .andReturn();
+		MvcResult mvcResult = this.mockMvc.perform(get("/path"))
+				.andExpect(status().isOk()) <1>
+				.andExpect(request().asyncStarted()) <2>
+				.andExpect(request().asyncResult("body")) <3>
+				.andReturn();
 
-        this.mockMvc.perform(asyncDispatch(mvcResult)) <4>
-                .andExpect(status().isOk()) <5>
-                .andExpect(content().string("body"));
-    }
+		this.mockMvc.perform(asyncDispatch(mvcResult)) <4>
+				.andExpect(status().isOk()) <5>
+				.andExpect(content().string("body"));
+	}
 ----
 <1> Check response status is still unchanged
 <2> Async processing must have started

framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/context-customizers.adoc

@@ -1,5 +1,5 @@
 [[testcontext-context-customizers]]
-= Configuration Configuration with Context Customizers
+= Context Configuration with Context Customizers
 
 A `ContextCustomizer` is responsible for customizing the supplied
 `ConfigurableApplicationContext` after bean definitions have been loaded into the context

framework-docs/modules/ROOT/pages/testing/webtestclient.adoc

@@ -396,7 +396,7 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-    import org.springframework.test.web.reactive.server.expectBody
+	import org.springframework.test.web.reactive.server.expectBody
 
 	client.get().uri("/persons/1")
 			.exchange()