Merge branch '2.3.x' into 2.4.x

Closes gh-26405

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java

@@ -52,8 +52,8 @@ public final class DockerImageNames {
 	}
 
 	/**
-	 * Return a {@link DockerImageName} suitable for running Cassandra.
-	 * @return a docker image name for running cassandra
+	 * Return a {@link DockerImageName} suitable for running Couchbase.
+	 * @return a docker image name for running couchbase
 	 */
 	public static DockerImageName couchbase() {
 		return DockerImageName.parse("couchbase/server").withTag(COUCHBASE_VERSION);