diff --git a/README.adoc b/README.adoc
index 58a2ec18a8..c7f6e9be1b 100755
--- a/README.adoc
+++ b/README.adoc
@@ -116,8 +116,7 @@ is automatically set if you use the maven wrapper.
 _Also see link:CONTRIBUTING.adoc[CONTRIBUTING.adoc] if you wish to submit pull requests,
 and in particular please fill out the
 https://support.springsource.com/spring_committer_signup[Contributor's Agreement]
-before your first change, however trivial. (Or if you filed such an agreement already for
-another project just mention that in your pull request.)_
+before your first change, however trivial._
 
 === Building reference documentation
 
diff --git a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointProperties.java b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointProperties.java
index 457831d4f4..59bf78203c 100644
--- a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointProperties.java
+++ b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointProperties.java
@@ -30,7 +30,7 @@ public class ConfigurationPropertiesReportEndpointProperties {
 
 	/**
 	 * Keys that should be sanitized. Keys can be simple strings that the property ends
-	 * with or regex expressions.
+	 * with or regular expressions.
 	 */
 	private String[] keysToSanitize;
 
diff --git a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/EndpointPathProvider.java b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/EndpointPathProvider.java
index f47149c4e8..82e78c1320 100644
--- a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/EndpointPathProvider.java
+++ b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/EndpointPathProvider.java
@@ -19,7 +19,7 @@ package org.springframework.boot.actuate.autoconfigure.endpoint.web;
 import java.util.List;
 
 /**
- * Interface that provides path information for web mapped endpints.
+ * Interface that provides path information for web mapped endpoints.
  *
  * @author Phillip Webb
  * @since 2.0.0
diff --git a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointProperties.java b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointProperties.java
index 3acbce2d78..0d0e0282c0 100644
--- a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointProperties.java
+++ b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointProperties.java
@@ -30,7 +30,7 @@ public class EnvironmentEndpointProperties {
 
 	/**
 	 * Keys that should be sanitized. Keys can be simple strings that the property ends
-	 * with or regex expressions.
+	 * with or regular expressions.
 	 */
 	private String[] keysToSanitize;
 
diff --git a/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/EndpointEnablementProviderTests.java b/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/EndpointEnablementProviderTests.java
index 7320ab5810..5b80513563 100644
--- a/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/EndpointEnablementProviderTests.java
+++ b/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/EndpointEnablementProviderTests.java
@@ -16,9 +16,7 @@
 
 package org.springframework.boot.actuate.autoconfigure.endpoint;
 
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import org.springframework.boot.actuate.endpoint.DefaultEnablement;
 import org.springframework.boot.actuate.endpoint.EndpointExposure;
@@ -35,9 +33,6 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class EndpointEnablementProviderTests {
 
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
 	@Test
 	public void defaultEnablementDisabled() {
 		EndpointEnablement enablement = getEndpointEnablement("foo",
diff --git a/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JmxEndpointIntegrationTests.java b/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JmxEndpointIntegrationTests.java
index 83524a0d59..093d0813b0 100644
--- a/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JmxEndpointIntegrationTests.java
+++ b/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JmxEndpointIntegrationTests.java
@@ -36,7 +36,7 @@ import org.springframework.util.StringUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests for endpints over JMX.
+ * Integration tests for endpoints over JMX.
  *
  * @author Stephane Nicoll
  * @author Andy Wilkinson
diff --git a/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/neo4j/Neo4jHealthIndicatorAutoConfigurationTests.java b/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/neo4j/Neo4jHealthIndicatorAutoConfigurationTests.java
index 4d0650d970..94996e9d35 100644
--- a/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/neo4j/Neo4jHealthIndicatorAutoConfigurationTests.java
+++ b/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/neo4j/Neo4jHealthIndicatorAutoConfigurationTests.java
@@ -34,7 +34,7 @@ import static org.mockito.Mockito.mock;
 /**
  * Tests for {@link Neo4jHealthIndicatorAutoConfiguration}.
  *
- * @author Phillp Webb
+ * @author Phillip Webb
  */
 public class Neo4jHealthIndicatorAutoConfigurationTests {
 
diff --git a/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/EndpointRequestTests.java b/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/EndpointRequestTests.java
index b1ead9cdbe..eadfb762b3 100644
--- a/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/EndpointRequestTests.java
+++ b/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/EndpointRequestTests.java
@@ -22,9 +22,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 
 import org.assertj.core.api.AssertDelegateTarget;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import org.springframework.boot.actuate.autoconfigure.endpoint.web.EndpointPathProvider;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
@@ -43,9 +41,6 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class EndpointRequestTests {
 
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
 	@Test
 	public void toAnyEndpointShouldMatchEndpointPath() throws Exception {
 		RequestMatcher matcher = EndpointRequest.toAnyEndpoint();
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Sanitizer.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Sanitizer.java
index c0716751b8..9298edb897 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Sanitizer.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Sanitizer.java
@@ -47,7 +47,7 @@ public class Sanitizer {
 
 	/**
 	 * Keys that should be sanitized. Keys can be simple strings that the property ends
-	 * with or regex expressions.
+	 * with or regular expressions.
 	 * @param keysToSanitize the keys to sanitize
 	 */
 	public void setKeysToSanitize(String... keysToSanitize) {
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 67e169a361..adfe84d083 100644
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -1094,7 +1094,7 @@ content into your application; rather pick only the properties that you need.
 	endpoints.configprops.cache.time-to-live=0 # Maximum time in milliseconds that a response can be cached.
 	endpoints.configprops.enabled= # Enable the configprops endpoint.
 	endpoints.configprops.jmx.enabled= # Expose the configprops endpoint as a JMX MBean.
-	endpoints.configprops.keys-to-sanitize=password,secret,key,token,.*credentials.*,vcap_services # Keys that should be sanitized. Keys can be simple strings that the property ends with or regex expressions.
+	endpoints.configprops.keys-to-sanitize=password,secret,key,token,.*credentials.*,vcap_services # Keys that should be sanitized. Keys can be simple strings that the property ends with or regular expressions.
 	endpoints.configprops.web.enabled= # Expose the configprops endpoint as a Web endpoint.
 
 	# ENDPOINT DEFAULT SETTINGS
@@ -1106,7 +1106,7 @@ content into your application; rather pick only the properties that you need.
 	endpoints.env.cache.time-to-live=0 # Maximum time in milliseconds that a response can be cached.
 	endpoints.env.enabled= # Enable the env endpoint.
 	endpoints.env.jmx.enabled= # Expose the env endpoint as a JMX MBean.
-	endpoints.env.keys-to-sanitize=password,secret,key,token,.*credentials.*,vcap_services # Keys that should be sanitized. Keys can be simple strings that the property ends with or regex expressions.
+	endpoints.env.keys-to-sanitize=password,secret,key,token,.*credentials.*,vcap_services # Keys that should be sanitized. Keys can be simple strings that the property ends with or regular expressions.
 	endpoints.env.web.enabled= # Expose the env endpoint as a Web endpoint.
 
 	# FLYWAY ENDPOINT ({sc-spring-boot-actuator}/endpoint/FlywayEndpoint.{sc-ext}[FlywayEndpoint])
diff --git a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
index d30cb2a206..8ef9ab1a59 100644
--- a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
@@ -231,7 +231,7 @@ When a custom management context path is configured, the "`discovery page`" will
 automatically move from `/application` to the root of the management context. For example,
 if the management context path is `/management` then the discovery page will be available
 from `/management`. When the management context path is set to `/` the discovery page
-is disabled to prevent the possiblility of a clash with other mappings.
+is disabled to prevent the possibility of a clash with other mappings.
 
 
 
diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index 7361be3220..aaee468d71 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -2828,8 +2828,8 @@ you can configure `security.oauth2.resource.jwk.key-set-uri`. E.g. on PWS:
 NOTE: Configuring both JWT and JWK properties will cause an error. Only one of `security.oauth2.resource.jwt.key-uri`
 (or `security.oauth2.resource.jwt.key-value`) and `security.oauth2.resource.jwk.key-set-uri` should be configured.
 
-WARNING: If you use the `security.oauth2.resource.jwt.key-uri` or `security.oauth2.resource.jwk.key-set-uri,
-` the authorization server needs to be running when your application starts up. It will log a warning if it can't
+WARNING: If you use the `security.oauth2.resource.jwt.key-uri` or `security.oauth2.resource.jwk.key-set-uri`,
+the authorization server needs to be running when your application starts up. It will log a warning if it can't
 find the key, and tell you what to do to fix it.
 
 OAuth2 resources are protected by a filter chain with order
diff --git a/spring-boot-docs/src/main/groovy/generateTestSlicesTable.groovy b/spring-boot-docs/src/main/groovy/generateTestSlicesTable.groovy
index 7d1cb91c3d..3da1826a02 100644
--- a/spring-boot-docs/src/main/groovy/generateTestSlicesTable.groovy
+++ b/spring-boot-docs/src/main/groovy/generateTestSlicesTable.groovy
@@ -3,7 +3,6 @@ import groovy.io.FileType
 import java.util.Properties
 
 import org.springframework.core.io.InputStreamResource
-import org.springframework.core.io.Resource
 import org.springframework.core.type.AnnotationMetadata
 import org.springframework.core.type.ClassMetadata
 import org.springframework.core.type.classreading.MetadataReader
@@ -72,10 +71,10 @@ MetadataReader createMetadataReader(MetadataReaderFactory factory, File classFil
 }
 
 TestSlice createTestSlice(Properties springFactories, ClassMetadata classMetadata, AnnotationMetadata annotationMetadata) {
-	new TestSlice(classMetadata.className, getImportedAutoConfiguration(springFactories, classMetadata, annotationMetadata))
+	new TestSlice(classMetadata.className, getImportedAutoConfiguration(springFactories, annotationMetadata))
 }
 
-Set<String> getImportedAutoConfiguration(Properties springFactories, ClassMetadata classMetadata, AnnotationMetadata annotationMetadata) {
+Set<String> getImportedAutoConfiguration(Properties springFactories, AnnotationMetadata annotationMetadata) {
 	Set<String> importers = findMetaImporters(annotationMetadata)
 	if (annotationMetadata.isAnnotated('org.springframework.boot.autoconfigure.ImportAutoConfiguration')) {
 		importers.add(annotationMetadata.className)
diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/MainClassConvention.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/MainClassConvention.java
index 2471b0e482..445c751dc3 100644
--- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/MainClassConvention.java
+++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/MainClassConvention.java
@@ -28,7 +28,7 @@ import org.gradle.api.file.FileCollection;
 import org.springframework.boot.loader.tools.MainClassFinder;
 
 /**
- * A {@link Callable} that provide a convention for the project's main class name.
+ * A {@link Callable} that provides a convention for the project's main class name.
  *
  * @author Andy Wilkinson
  */
diff --git a/spring-boot/src/test/java/org/springframework/boot/endpoint/web/EndpointMappingTests.java b/spring-boot/src/test/java/org/springframework/boot/endpoint/web/EndpointMappingTests.java
index 91f242f097..a78e942d82 100644
--- a/spring-boot/src/test/java/org/springframework/boot/endpoint/web/EndpointMappingTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/endpoint/web/EndpointMappingTests.java
@@ -69,7 +69,7 @@ public class EndpointMappingTests {
 	}
 
 	@Test
-	public void subPathWithoutALeadingSlashIsSeparaedFromBasePathBySingleSlash() {
+	public void subPathWithoutALeadingSlashIsSeparatedFromBasePathBySingleSlash() {
 		assertThat(new EndpointMapping("/test").createSubPath("one")).isEqualTo("/test/one");
 	}
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/security/ApplicationContextRequestMatcherTests.java b/spring-boot/src/test/java/org/springframework/boot/security/ApplicationContextRequestMatcherTests.java
index 56778b504e..830353e8f2 100644
--- a/spring-boot/src/test/java/org/springframework/boot/security/ApplicationContextRequestMatcherTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/security/ApplicationContextRequestMatcherTests.java
@@ -104,7 +104,7 @@ public class ApplicationContextRequestMatcherTests {
 	static class TestApplicationContextRequestMatcher<C>
 			extends ApplicationContextRequestMatcher<C> {
 
-		private C provdedContext;
+		private C providedContext;
 
 		TestApplicationContextRequestMatcher(Class<? extends C> context) {
 			super(context);
@@ -117,17 +117,17 @@ public class ApplicationContextRequestMatcherTests {
 
 		public C callMatchesAndReturnProvidedContext(HttpServletRequest request) {
 			matches(request);
-			return getProvdedContext();
+			return getProvidedContext();
 		}
 
 		@Override
 		protected boolean matches(HttpServletRequest request, C context) {
-			this.provdedContext = context;
+			this.providedContext = context;
 			return false;
 		}
 
-		public C getProvdedContext() {
-			return this.provdedContext;
+		public C getProvidedContext() {
+			return this.providedContext;
 		}
 
 	}