diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java
index e44f88e1db..fc5b687c71 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java
@@ -56,7 +56,7 @@ public class ElasticsearchDataAutoConfigurationTests {
 				ElasticsearchAutoConfiguration.class,
 				ElasticsearchDataAutoConfiguration.class);
 		this.context.refresh();
-		asssertHasSingleBean(ElasticsearchTemplate.class);
+		assertHasSingleBean(ElasticsearchTemplate.class);
 	}
 
 	@Test
@@ -70,7 +70,7 @@ public class ElasticsearchDataAutoConfigurationTests {
 				ElasticsearchAutoConfiguration.class,
 				ElasticsearchDataAutoConfiguration.class);
 		this.context.refresh();
-		asssertHasSingleBean(SimpleElasticsearchMappingContext.class);
+		assertHasSingleBean(SimpleElasticsearchMappingContext.class);
 	}
 
 	@Test
@@ -84,10 +84,10 @@ public class ElasticsearchDataAutoConfigurationTests {
 				ElasticsearchAutoConfiguration.class,
 				ElasticsearchDataAutoConfiguration.class);
 		this.context.refresh();
-		asssertHasSingleBean(ElasticsearchConverter.class);
+		assertHasSingleBean(ElasticsearchConverter.class);
 	}
 
-	private void asssertHasSingleBean(Class<?> type) {
+	private void assertHasSingleBean(Class<?> type) {
 		assertThat(this.context.getBeanNamesForType(type)).hasSize(1);
 	}
 
diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
index 8bfdf5e6ae..c39e871523 100644
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -714,7 +714,7 @@ content into your application; rather pick only the properties that you need.
 	spring.h2.console.settings.trace=false # Enable trace output.
 	spring.h2.console.settings.web-allow-others=false # Enable remote access.
 
-	# InfluxDB ({sc-spring-boot-autoconfigure}/influx/InfluxProperties.{sc-ext}[InfluxProperties])
+	# InfluxDB ({sc-spring-boot-autoconfigure}/influx/InfluxDbProperties.{sc-ext}[InfluxDbProperties])
 	spring.influx.password= # Login password.
 	spring.influx.url= # Url of the InfluxDB instance to connect to.
 	spring.influx.user= # Login user.
diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc
index 16305c4abe..624d44e9db 100644
--- a/spring-boot-docs/src/main/asciidoc/howto.adoc
+++ b/spring-boot-docs/src/main/asciidoc/howto.adoc
@@ -620,7 +620,7 @@ typically in `application.properties` or `application.yml`. For example:
 	server.ssl.key-password=another-secret
 ----
 
-See {sc-spring-boot}/context/embedded/Ssl.{sc-ext}[`Ssl`] for details of all of the
+See {sc-spring-boot}/web/server/Ssl.{sc-ext}[`Ssl`] for details of all of the
 supported properties.
 
 Using configuration like the example above means the application will no longer support
diff --git a/spring-boot/src/test/java/org/springframework/boot/env/SystemEnvironmentPropertySourceEnvironmentPostProcessorTests.java b/spring-boot/src/test/java/org/springframework/boot/env/SystemEnvironmentPropertySourceEnvironmentPostProcessorTests.java
index 0523f14857..297e5083c8 100644
--- a/spring-boot/src/test/java/org/springframework/boot/env/SystemEnvironmentPropertySourceEnvironmentPostProcessorTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/env/SystemEnvironmentPropertySourceEnvironmentPostProcessorTests.java
@@ -44,7 +44,7 @@ public class SystemEnvironmentPropertySourceEnvironmentPostProcessorTests {
 	}
 
 	@Test
-	public void postProcessShouldReplaceSystemEnviromentPropertySource()
+	public void postProcessShouldReplaceSystemEnvironmentPropertySource()
 			throws Exception {
 		SystemEnvironmentPropertySourceEnvironmentPostProcessor postProcessor = new SystemEnvironmentPropertySourceEnvironmentPostProcessor();
 		postProcessor.postProcessEnvironment(this.environment, null);