diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java
index 93dac69a62e..ca66f6773bd 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java
@@ -456,7 +456,7 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
 	}
 
 	/**
-	 * Reset any cached handers just in case a jar protocol has already been used. We
+	 * Reset any cached handlers just in case a jar protocol has already been used. We
 	 * reset the handler by trying to set a null {@link URLStreamHandlerFactory} which
 	 * should have no effect other than clearing the handlers cache.
 	 */
diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
index 53e52d3b412..a8047eb5922 100644
--- a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
+++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
@@ -755,7 +755,7 @@ public class SpringApplication {
 	/**
 	 * Called after the context has been refreshed.
 	 * @param context the application context
-	 * @param args the application argumments
+	 * @param args the application arguments
 	 */
 	protected void afterRefresh(ConfigurableApplicationContext context,
 			ApplicationArguments args) {
@@ -799,7 +799,7 @@ public class SpringApplication {
 	/**
 	 * Called after the context has been refreshed.
 	 * @param context the application context
-	 * @param args the application argumments
+	 * @param args the application arguments
 	 * @deprecated in 1.3 in favor of
 	 * {@link #afterRefresh(ConfigurableApplicationContext, ApplicationArguments)}
 	 */
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletRegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletRegistrationBean.java
index a407906b064..38fa545f061 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletRegistrationBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletRegistrationBean.java
@@ -100,7 +100,7 @@ public class ServletRegistrationBean extends RegistrationBean {
 
 	/**
 	 * Returns the servlet being registered.
-	 * @return the sevlet
+	 * @return the servlet
 	 */
 	protected Servlet getServlet() {
 		return this.servlet;
diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java
index 18b14de2dfd..e00332b1277 100644
--- a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java
+++ b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java
@@ -106,7 +106,7 @@ public class AtomikosProperties {
 	/**
 	 * Specifies if subtransactions should be joined when possible. Defaults to true. When
 	 * false, no attempt to call {@code XAResource.start(TM_JOIN)} will be made for
-	 * different but related subtransctions. This setting has no effect on resource access
+	 * different but related subtransactions. This setting has no effect on resource access
 	 * within one and the same transaction. If you don't use subtransactions then this
 	 * setting can be ignored.
 	 * @param serialJtaTransactions if serial JTA transaction are supported
diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentHandler.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentHandler.java
index 6df72c29ffa..048b8a633e9 100644
--- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentHandler.java
+++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentHandler.java
@@ -55,7 +55,7 @@ abstract class ServletComponentHandler {
 		String[] urlPatterns = (String[]) attributes.get("urlPatterns");
 		if (urlPatterns.length > 0) {
 			Assert.state(value.length == 0,
-					"The urlPatterns and value attributes " + "are mututally exclusive");
+					"The urlPatterns and value attributes are mutually exclusive.");
 			return urlPatterns;
 		}
 		return value;
diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentRegisteringPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentRegisteringPostProcessor.java
index 3448969e791..cc2f18e71af 100644
--- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentRegisteringPostProcessor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentRegisteringPostProcessor.java
@@ -46,11 +46,11 @@ class ServletComponentRegisteringPostProcessor
 	private static final List<ServletComponentHandler> HANDLERS;
 
 	static {
-		List<ServletComponentHandler> handers = new ArrayList<ServletComponentHandler>();
-		handers.add(new WebServletHandler());
-		handers.add(new WebFilterHandler());
-		handers.add(new WebListenerHandler());
-		HANDLERS = Collections.unmodifiableList(handers);
+		List<ServletComponentHandler> handlers = new ArrayList<ServletComponentHandler>();
+		handlers.add(new WebServletHandler());
+		handlers.add(new WebFilterHandler());
+		handlers.add(new WebListenerHandler());
+		HANDLERS = Collections.unmodifiableList(handlers);
 	}
 
 	private final Set<String> packagesToScan;
diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java
index 450a25cddbe..c4748ecabbb 100644
--- a/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java
@@ -189,7 +189,7 @@ public class BindingPreparationTests {
 		wrapper.setPropertyValue("nested[foo]", new LinkedHashMap<String, Object>());
 		// But it might equally well be a collection, if nested[foo][0]
 		wrapper.setPropertyValue("nested[foo]", new ArrayList<Object>());
-		// Then it would have to be actually bound to get the list to autogrow
+		// Then it would have to be actually bound to get the list to auto-grow
 		wrapper.setPropertyValue("nested[foo][0]", "bar");
 		assertNotNull(wrapper.getPropertyValue("nested[foo][0]"));
 	}
diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java
index 84761a634ae..5e035e7e107 100644
--- a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java
@@ -243,7 +243,7 @@ public class RelaxedDataBinderTests {
 	}
 
 	@Test
-	public void testBindNestedWithEnviromentStyle() throws Exception {
+	public void testBindNestedWithEnvironmentStyle() throws Exception {
 		TargetWithNestedObject target = new TargetWithNestedObject();
 		bind(target, "nested_foo: bar\n" + "nested_value: 123");
 		assertEquals(123, target.getNested().getValue());
diff --git a/spring-boot/src/test/java/org/springframework/boot/web/servlet/WebFilterHandlerTests.java b/spring-boot/src/test/java/org/springframework/boot/web/servlet/WebFilterHandlerTests.java
index be878147aba..68b223c1d80 100644
--- a/spring-boot/src/test/java/org/springframework/boot/web/servlet/WebFilterHandlerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/web/servlet/WebFilterHandlerTests.java
@@ -155,7 +155,7 @@ public class WebFilterHandlerTests {
 	public void urlPatternsDeclaredTwice() throws IOException {
 		this.thrown.expect(IllegalStateException.class);
 		this.thrown.expectMessage(
-				"The urlPatterns and value attributes are mututally " + "exclusive");
+				"The urlPatterns and value attributes are mutually exclusive.");
 		getBeanDefinition(UrlPatternsDeclaredTwiceFilter.class);
 	}
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/web/servlet/WebServletHandlerTests.java b/spring-boot/src/test/java/org/springframework/boot/web/servlet/WebServletHandlerTests.java
index 462b0faaea8..52b817e1f29 100644
--- a/spring-boot/src/test/java/org/springframework/boot/web/servlet/WebServletHandlerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/web/servlet/WebServletHandlerTests.java
@@ -134,7 +134,7 @@ public class WebServletHandlerTests {
 	public void urlPatternsDeclaredTwice() throws IOException {
 		this.thrown.expect(IllegalStateException.class);
 		this.thrown.expectMessage(
-				"The urlPatterns and value attributes are mututally " + "exclusive");
+				"The urlPatterns and value attributes are mutually exclusive.");
 		getBeanDefinition(UrlPatternsDeclaredTwiceServlet.class);
 	}