Merge branch '3.2.x' into 3.3.x

Closes gh-41920

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/metrics.adoc

@@ -1082,7 +1082,7 @@ Auto-configuration registers a `MongoMetricsConnectionPoolListener` with the aut
 
 The following gauge metrics are created for the connection pool:
 
-* `mongodb.driver.pool.size` reports the current size of the connection pool, including idle and and in-use members.
+* `mongodb.driver.pool.size` reports the current size of the connection pool, including idle and in-use members.
 * `mongodb.driver.pool.checkedout` reports the count of connections that are currently in use.
 * `mongodb.driver.pool.waitqueuesize` reports the current size of the wait queue for a connection from the pool.
 

spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java

@@ -42,7 +42,7 @@ import org.testcontainers.utility.DockerImageName;
 import org.springframework.util.Assert;
 
 /**
- * References to container images used for integration tests. This class also acts a a
+ * References to container images used for integration tests. This class also acts a
  * central location for tests to {@link #container(Class) create} a correctly configured
  * {@link Container testcontainer}.
  *

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/JarUri.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.springframework.boot.origin;
 import java.net.URI;
 
 /**
- * Simple class that understands Jar URLs can can provide short descriptions.
+ * Simple class that understands Jar URLs and can provide short descriptions.
  *
  * @author Phillip Webb
  */

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemSslStoreDetails.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ import org.springframework.util.StringUtils;
  * @param password the password used
  * {@link KeyStore#setKeyEntry(String, java.security.Key, char[], java.security.cert.Certificate[])
  * setting key entries} in the {@link KeyStore}
- * @param certificates the certificates content (either the PEM content itself or or a
+ * @param certificates the certificates content (either the PEM content itself or a
  * reference to the resource to load). When a {@link #privateKey() private key} is present
  * this value is treated as a certificate chain, otherwise it is treated a list of
  * certificates that should all be registered.