Merge branch '2.3.x'

Closes gh-21734

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/FileDescriptor.java

@@ -21,8 +21,7 @@ import java.io.IOException;
 import java.util.function.IntConsumer;
 
 /**
- * Provides access to an opaque to the underling file system representation of an open
+ * Provides access to the underlying file system representation of an open file.
- * file.
  *
  * @author Phillip Webb
  * @see #acquire()

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java

@@ -438,7 +438,7 @@ public class RestTemplateBuilder {
 	}
 
 	/**
-	 * Sets if the underling {@link ClientHttpRequestFactory} should buffer the
+	 * Sets if the underlying {@link ClientHttpRequestFactory} should buffer the
 	 * {@linkplain ClientHttpRequest#getBody() request body} internally.
 	 * @param bufferRequestBody value of the bufferRequestBody parameter
 	 * @return a new builder instance.

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertySourcesTests.java

@@ -144,7 +144,7 @@ class ConfigurationPropertySourcesTests {
 	}
 
 	@Test // gh-21416
-	void decendantOfPropertyAccessWhenMutableWithCacheShouldBePerformant() {
+	void descendantOfPropertyAccessWhenMutableWithCacheShouldBePerformant() {
 		StandardEnvironment environment = createPerformanceTestEnvironment(true);
 		Iterable<ConfigurationPropertySource> sources = ConfigurationPropertySources.get(environment);
 		ConfigurationPropertyName missing = ConfigurationPropertyName.of("missing");