Merge pull request #7403 from izeye/polish-20161116

* pr/7403:
  Polish

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/NamedMvcEndpoint.java

@@ -17,7 +17,7 @@
 package org.springframework.boot.actuate.endpoint.mvc;
 
 /**
- * A {@link MvcEndpoint} that also includes a logical name. Unlike {@link #getPath()
+ * An {@link MvcEndpoint} that also includes a logical name. Unlike {@link #getPath()
  * endpoints paths}, it should not be possible for a user to change the endpoint name.
  * Names provide a consistent way to reference an endpoint, for example they may be used
  * as the {@literal 'rel'} attribute in a HAL response.

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java

@@ -30,7 +30,7 @@ import org.springframework.jdbc.support.SQLExceptionTranslator;
 import org.springframework.jdbc.support.SQLStateSQLExceptionTranslator;
 
 /**
- * Transforms {@link java.sql.SQLException} into a Spring-specific @{link
+ * Transforms {@link java.sql.SQLException} into a Spring-specific {@link
  * DataAccessException}.
  *
  * @author Lukas Eder

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

@@ -16,6 +16,7 @@
 
 package org.springframework.boot.autoconfigure.condition;
 
+import org.junit.After;
 import org.junit.Test;
 
 import org.springframework.boot.cloud.CloudPlatform;
@@ -33,6 +34,13 @@ public class ConditionalOnCloudPlatformTests {
 
 	private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 
+	@After
+	public void cleanUp() {
+		if (this.context != null) {
+			this.context.close();
+		}
+	}
+
 	@Test
 	public void outcomeWhenCloudfoundryPlatformNotPresentShouldNotMatch()
 			throws Exception {

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

@@ -577,7 +577,7 @@ public class WebMvcAutoConfigurationTests {
 	}
 
 	@Test
-	public void welcomePageMappingDoesNotHandleRequestThatDoNotAcceptTextHtml()
+	public void welcomePageMappingDoesNotHandleRequestsThatDoNotAcceptTextHtml()
 			throws Exception {
 		load("spring.resources.static-locations:classpath:/welcome-page/");
 		assertThat(this.context.getBeansOfType(WelcomePageHandlerMapping.class))

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

@@ -953,7 +953,7 @@ documentation].
 == Loggers
 Spring Boot Actuator includes the ability to view and configure the log levels of your
 application at runtime.  You can view either the entire list or an individual logger's
-configuration which is made up of both the explictily configured logging level as well as
+configuration which is made up of both the explicitly configured logging level as well as
 the effective logging level given to it by the logging framework.  These levels can be:
 
 * `TRACE`
@@ -965,7 +965,7 @@ the effective logging level given to it by the logging framework.  These levels
 * `OFF`
 * `null`
 
-with `null` indicating that there is no explict configuration.
+with `null` indicating that there is no explicit configuration.
 
 
 

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

@@ -3886,7 +3886,7 @@ abstraction expects. No further customization is applied on it.
 EhCache 2.x is used if a file named `ehcache.xml` can be found at the root of the
 classpath. If EhCache 2.x, the `EhCacheCacheManager` provided by the
 `spring-boot-starter-cache` '`Starter`' and such file is present it is used to bootstrap
-the cache manager. An alternate configuration file can be provide a well using:
+the cache manager. An alternate configuration file can be provided as well using:
 
 [source,properties,indent=0]
 ----

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

@@ -769,7 +769,7 @@ dependencies out-of-the-box so you may want to have a look to the
 {propdeps-plugin}[`propdeps-plugin`] in the meantime.
 
 TIP: repackaged archives do not contain devtools by default. If you want to use
-<<using-boot-devtools-remote,certain remote devtools feature>>, you'll need to enable the
+<<using-boot-devtools-remote,certain remote devtools feature>>, you'll need to disable the
 `excludeDevtools` build property to include it. The property is supported with both the
 Maven and Gradle plugins.
 

spring-boot-samples/spring-boot-sample-test-nomockito/pom.xml

@@ -42,6 +42,7 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<build>

spring-boot-samples/spring-boot-sample-test-nomockito/src/test/java/sample/testnomockito/SampleTestNoMockitoApplicationTest.java

@@ -10,7 +10,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests that {code ResetMocksTestExecutionListener} and
+ * Tests that {@code ResetMocksTestExecutionListener} and
  * {@code MockitoTestExecutionListener} gracefully degrade when Mockito is not on the
  * classpath.
  *

spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/RunProcess.java

@@ -52,7 +52,7 @@ public class RunProcess {
 
 	/**
 	 * Creates new {@link RunProcess} instance for the specified command.
-	 * @param command the program to execute and it's arguments
+	 * @param command the program to execute and its arguments
 	 */
 	public RunProcess(String... command) {
 		this(null, command);
@@ -63,7 +63,7 @@ public class RunProcess {
 	 * command.
 	 * @param workingDirectory the working directory of the child process or {@code null}
 	 * to run in the working directory of the current Java process
-	 * @param command the program to execute and it's arguments
+	 * @param command the program to execute and its arguments
 	 */
 	public RunProcess(File workingDirectory, String... command) {
 		this.workingDirectory = workingDirectory;

spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java

@@ -65,7 +65,7 @@ public class ExplodedArchive implements Archive {
 	 * Create a new {@link ExplodedArchive} instance.
 	 * @param root the root folder
 	 * @param recursive if recursive searching should be used to locate the manifest.
-	 * Defaults to {@code true}, folders with a large tree might want to set this to {code
+	 * Defaults to {@code true}, folders with a large tree might want to set this to {@code
 	 * false}.
 	 */
 	public ExplodedArchive(File root, boolean recursive) {

spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java

@@ -89,7 +89,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
 
 	/**
 	 * Current working directory to use for the application. If not specified, basedir
-	 * will be used NOTE: the use of working directory means that processes will be
+	 * will be used. NOTE: the use of working directory means that processes will be
 	 * started by forking a new JVM.
 	 * @since 1.5
 	 */