Merge pull request #5013 from izeye/polish-20160123

* pr/5013:
  Polish

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheViewResolverTests.java

@@ -16,10 +16,10 @@
 
 package org.springframework.boot.autoconfigure.mustache.web;
 
+import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.Locale;
 
-import org.fusesource.hawtbuf.ByteArrayInputStream;
 import org.junit.Before;
 import org.junit.Test;
 

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -1824,8 +1824,8 @@ inside a war will break Spring Boot applications.
 If you need to perform servlet context initialization in a Spring Boot application, you
 should register a bean that implements the
 `org.springframework.boot.context.embedded.ServletContextInitializer` interface. The
-single `onStartup` method provides access to the `ServletContext`, and  can easily be used
-as an adapter to an existing `WebApplicationInitializer if necessary.
+single `onStartup` method provides access to the `ServletContext`, and can easily be used
+as an adapter to an existing `WebApplicationInitializer` if necessary.
 
 
 

spring-boot-integration-tests/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchVerficationController.java → spring-boot-integration-tests/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchVerificationController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-public class LaunchVerficationController {
+public class LaunchVerificationController {
 
 	@RequestMapping("/")
 	public String verifyLaunch() {

spring-boot/src/main/java/org/springframework/boot/SpringApplication.java

@@ -829,7 +829,7 @@ public class SpringApplication {
 		}
 		try {
 			try {
-				handeExitCode(context, exception);
+				handleExitCode(context, exception);
 				listeners.finished(context, exception);
 			}
 			finally {
@@ -856,7 +856,7 @@ public class SpringApplication {
 		}
 	}
 
-	private void handeExitCode(ConfigurableApplicationContext context,
+	private void handleExitCode(ConfigurableApplicationContext context,
 			Throwable exception) {
 		int exitCode = getExitCodeFromException(context, exception);
 		if (exitCode != 0) {