Merge branch '2.4.x' into 2.5.x

Closes gh-27943
spring-projects · Sep 12, 2021 · 2327cda · 2327cda
2 parents ad6018a + a0289d7
commit 2327cda
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc
@@ -388,7 +388,7 @@ include::{docs-java}/features/testing/springbootapplications/springmvctests/MyCo
 
 TIP: If you need to configure elements of the auto-configuration (for example, when servlet filters should be applied) you can use attributes in the `@AutoConfigureMockMvc` annotation.
 
-If you use HtmlUnit or Selenium, auto-configuration also provides an HtmlUnit `WebClient` bean and/or a Selenium `WebDriver` bean.
+If you use HtmlUnit and Selenium, auto-configuration also provides an HtmlUnit `WebClient` bean and/or a Selenium `WebDriver` bean.
 The following example uses HtmlUnit:
 
 [source,java,indent=0,subs="verbatim"]