Merge pull request #6046 from izeye:polish-2016052

* pr/6046:
  Polish
  Polish

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolver.java

@@ -152,7 +152,7 @@ public class DefaultErrorViewResolver implements ErrorViewResolver, Ordered {
 	}
 
 	/**
-	 * {@link View} backed by a HTML resource.
+	 * {@link View} backed by an HTML resource.
 	 */
 	private static class HtmlResourceView implements View {
 

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTypeDeductionFailureTests.java

@@ -49,7 +49,6 @@ public class OnBeanConditionTypeDeductionFailureTests {
 			fail("Context refresh was successful");
 		}
 		catch (Exception ex) {
-			ex.printStackTrace();
 			Throwable beanTypeDeductionException = findBeanTypeDeductionException(ex);
 			assertThat(beanTypeDeductionException)
 					.hasMessage("Failed to deduce bean type for "

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/template/TemplateAvailabilityProvidersTests.java

@@ -196,7 +196,7 @@ public class TemplateAvailabilityProvidersTests {
 	}
 
 	@Test
-	public void getProvderWhenCacheDisabledShouldNotUseCache() throws Exception {
+	public void getProviderWhenCacheDisabledShouldNotUseCache() throws Exception {
 		given(this.provider.isTemplateAvailable(this.view, this.environment,
 				this.classLoader, this.resourceLoader)).willReturn(true);
 		this.environment.setProperty("spring.template.provider.cache", "false");

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -31,7 +31,7 @@ content into your application; rather pick only the properties that you need.
 	# BANNER
 	banner.charset=UTF-8 # Banner file encoding.
 	banner.location=classpath:banner.txt # Banner file location.
-	banner.image.location=classpath:banner.gif # (Banner image file location, jpg/png can also be used).
+	banner.image.location=classpath:banner.gif # Banner image file location (jpg/png can also be used).
 	banner.image.width= # Width of the banner image in chars (default 76)
 	banner.image.height= # Height of the banner image in chars (default based on image height)
 	banner.image.margin= # Left hand image margin in chars (default 2)

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

@@ -52,7 +52,7 @@ such as the user that launched the application.
 The banner that is printed on start up can be changed by adding a `banner.txt` file
 to your classpath, or by setting `banner.location` to the location of such a file.
 If the file has an unusual encoding you can set `banner.charset` (default is `UTF-8`).
-In addition a text file, you can also add a `banner.gif`, `banner.jpg` or `banner.png`
+In addition to a text file, you can also add a `banner.gif`, `banner.jpg` or `banner.png`
 image file to your classpath, or set a `banner.image.location` property. Images will be
 converted into an ASCII art representation and printed above any text banner.
 
@@ -1741,7 +1741,7 @@ this:
 	             +- <other public assets>
 ----
 
-To map all `5xx` errors using a freemarker template, you'd have a structure like this:
+To map all `5xx` errors using a FreeMarker template, you'd have a structure like this:
 
 [source,indent=0,subs="verbatim,quotes,attributes"]
 ----
@@ -1750,7 +1750,7 @@ To map all `5xx` errors using a freemarker template, you'd have a structure like
 	     +- java/
 	     |   + <source code>
 	     +- resources/
-	         +- template/
+	         +- templates/
 	             +- error/
 	             |   +- 5xx.ftl
 	             +- <other templates>
@@ -1786,7 +1786,7 @@ will then pick up any unhandled exceptions.
 For applications that aren't using Spring MVC, you can use the `ErrorPageRegistrar`
 interface to directly register `ErrorPages`. This abstraction works directly with the
 underlying embedded servlet container and will work even if you don't have a Spring MVC
-`DispatcherServlet`
+`DispatcherServlet`.
 
 
 [source,java,indent=0,subs="verbatim,quotes,attributes"]

spring-boot-test/src/main/java/org/springframework/boot/test/SpringBootMockServletContext.java

@@ -20,7 +20,7 @@ import org.springframework.core.io.ResourceLoader;
 import org.springframework.mock.web.MockServletContext;
 
 /**
- * {@link MockServletContext} implementation for Spring Boot. Respects well know Spring
+ * {@link MockServletContext} implementation for Spring Boot. Respects well-known Spring
  * Boot resource locations and uses an empty directory for "/" if no locations can be
  * found.
  *

spring-boot-test/src/main/java/org/springframework/boot/test/mock/web/SpringBootMockServletContext.java

@@ -27,7 +27,7 @@ import org.springframework.core.io.ResourceLoader;
 import org.springframework.mock.web.MockServletContext;
 
 /**
- * {@link MockServletContext} implementation for Spring Boot. Respects well know Spring
+ * {@link MockServletContext} implementation for Spring Boot. Respects well-known Spring
  * Boot resource locations and uses an empty directory for "/" if no locations can be
  * found.
  *

spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java

@@ -66,7 +66,7 @@ import org.springframework.web.util.UriTemplateHandler;
  * Apache Http Client 4.3.2 or better is available (recommended) it will be used as the
  * client, and by default configured to ignore cookies and redirects.
  * <p>
- * Note: To prevent injection problems this class internationally does not extend
+ * Note: To prevent injection problems this class internally does not extend
  * {@link RestTemplate}. If you need access to the underlying {@link RestTemplate} use
  * {@link #getRestTemplate()}.
  *

spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -19,7 +19,7 @@
   {
     "name": "banner.image.location",
     "type": "org.springframework.core.io.Resource",
-    "description": "Banner image file location.",
+    "description": "Banner image file location (jpg/png can also be used).",
     "defaultValue": "banner.gif"
   },
   {
@@ -35,7 +35,7 @@
   {
     "name": "banner.image.margin",
     "type": "java.lang.Integer",
-    "description": "Left hand image height (in chars)."
+    "description": "Left hand image margin (in chars)."
   },
   {
     "name": "banner.image.invert",

spring-boot/src/test/java/org/springframework/boot/ImageBannerTests.java

@@ -121,7 +121,6 @@ public class ImageBannerTests {
 		AnsiOutput.setEnabled(AnsiOutput.Enabled.NEVER);
 		String banner = printBanner("gradient.gif", "banner.image.width=10",
 				"banner.image.margin=0");
-		System.out.println(banner);
 		assertThat(banner).contains("@#8&o:*.  ");
 	}