diff --git a/ci/README.adoc b/ci/README.adoc
index 926794e620..296b439330 100644
--- a/ci/README.adoc
+++ b/ci/README.adoc
@@ -8,7 +8,7 @@ $ fly -t spring set-pipeline -p spring-boot -c ci/pipeline.yml -l ci/parameters.
 ----
 
 NOTE: This assumes that you have credhub integration configured with the appropriate
-secrets
+secrets.
 
 === Release
 
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/asciidoc/endpoints/loggers.adoc b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/asciidoc/endpoints/loggers.adoc
index edc07c648a..0179b8dc6c 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/asciidoc/endpoints/loggers.adoc
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/asciidoc/endpoints/loggers.adoc
@@ -46,7 +46,7 @@ include::{snippets}loggers/single/http-response.adoc[]
 
 
 
-[[loggerse-single-response-structure]]
+[[loggers-single-response-structure]]
 === Response Structure
 
 The response contains details of the requested logger. The following table describes the
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/asciidoc/endpoints/shutdown.adoc b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/asciidoc/endpoints/shutdown.adoc
index b2c8f689e4..fedc33dd2f 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/asciidoc/endpoints/shutdown.adoc
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/asciidoc/endpoints/shutdown.adoc
@@ -19,7 +19,7 @@ include::{snippets}shutdown/http-response.adoc[]
 
 
 
-[[shutdowm-shutting-down-response-structure]]
+[[shutdown-shutting-down-response-structure]]
 === Response Structure
 
 The response contains details of the result of the shutdown request. The following table
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java
index 899bc875fe..ba74b3a8d0 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java
@@ -75,7 +75,7 @@ public class ReactiveSecurityAutoConfigurationTests {
 	}
 
 	@Test
-	public void doesNotConfigureDefaultUserIfUserDetailsRepositoryAvailable() {
+	public void doesNotConfigureDefaultUserIfUserDetailsServiceAvailable() {
 		this.contextRunner.withUserConfiguration(UserConfig.class, TestConfig.class)
 				.withConfiguration(
 						AutoConfigurations.of(ReactiveSecurityAutoConfiguration.class))
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index 68ac04bfd0..ed1abec578 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -6686,7 +6686,7 @@ It then becomes important not to litter the application's main class with config
 settings that are specific to a particular area of its functionality.
 
 Assume that you are using Spring Batch and you rely on the auto-configuration for it.
-Your could define your `@SpringBootApplication` as follows:
+You could define your `@SpringBootApplication` as follows:
 
 [source,java,indent=0]
 ----
@@ -6708,7 +6708,7 @@ at the same level as your application, as shown in the following example:
 ----
 
 NOTE: Depending on the complexity of your application, you may either have a single
-`ApplicationConfiguration` class for your customizations or one class per domain area when
+`@Configuration` class for your customizations or one class per domain area when
 it makes sense. The latter approach lets you enable it in one of your tests, if necessary,
 with the `@Import` annotation.
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/CollectionBinderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/CollectionBinderTests.java
index 699ac52ab6..42feb24465 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/CollectionBinderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/CollectionBinderTests.java
@@ -362,7 +362,7 @@ public class CollectionBinderTests {
 		Bindable<BeanWithNestedCollection> target = Bindable
 				.of(BeanWithNestedCollection.class);
 		BeanWithNestedCollection foo = this.binder.bind("foo", target).get();
-		assertThat(foo.getValue()).isNotNull();
+		assertThat(foo.getValue()).isEqualTo("one");
 		assertThat(foo.getFoos().get(0).getValue()).isEqualTo("two");
 		assertThat(foo.getFoos().get(1).getValue()).isEqualTo("three");
 	}
diff --git a/spring-boot-samples/spring-boot-sample-secure-webflux/src/main/java/sample/secure/webflux/SampleSecureWebFluxApplication.java b/spring-boot-samples/spring-boot-sample-secure-webflux/src/main/java/sample/secure/webflux/SampleSecureWebFluxApplication.java
index 748db3ee82..0739120c92 100644
--- a/spring-boot-samples/spring-boot-sample-secure-webflux/src/main/java/sample/secure/webflux/SampleSecureWebFluxApplication.java
+++ b/spring-boot-samples/spring-boot-sample-secure-webflux/src/main/java/sample/secure/webflux/SampleSecureWebFluxApplication.java
@@ -41,7 +41,7 @@ public class SampleSecureWebFluxApplication {
 	}
 
 	@Bean
-	public ReactiveUserDetailsService userDetailsRepository() {
+	public ReactiveUserDetailsService userDetailsService() {
 		return new MapReactiveUserDetailsService(User.withDefaultPasswordEncoder()
 				.username("foo").password("password").roles("USER").build());
 	}