Merge pull request #12004 from izeye:polish-20180213

* pr/12004:
  Polish

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java

@@ -174,7 +174,7 @@ public class MetricsProperties {
 		/**
 		 * Specific SLA boundaries for meter IDs starting-with the specified name. The
 		 * longest match wins, the key `all` can also be used to configure all meters.
-		 * Counters will be published for each sepecified boundary. Values can be
+		 * Counters will be published for each specified boundary. Values can be
 		 * specified as a long or as a Duration value (for timer meters, defaulting to ms
 		 * if no unit specified).
 		 */

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilterTests.java

@@ -39,7 +39,7 @@ import org.springframework.mock.env.MockEnvironment;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests fir {@link PropertiesMeterFilter}.
+ * Tests for {@link PropertiesMeterFilter}.
  *
  * @author Phillip Webb
  * @author Jon Schneider

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/ServiceLevelAgreementBoundaryTests.java

@@ -65,7 +65,7 @@ public class ServiceLevelAgreementBoundaryTests {
 	}
 
 	@Test
-	public void getValueForTimerWhenFromDurationStringShouldReturnDrationNanos() {
+	public void getValueForTimerWhenFromDurationStringShouldReturnDurationNanos() {
 		ServiceLevelAgreementBoundary sla = ServiceLevelAgreementBoundary
 				.valueOf("123ms");
 		assertThat(sla.getValue(Type.TIMER)).isEqualTo(123000000);

spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommandTests.java

@@ -56,7 +56,7 @@ public class EncodePasswordCommandTests {
 	}
 
 	@Test
-	public void encodeWithNoAlgorithShouldUseBcrypt() throws Exception {
+	public void encodeWithNoAlgorithmShouldUseBcrypt() throws Exception {
 		EncodePasswordCommand command = new EncodePasswordCommand();
 		ExitStatus status = command.run("boot");
 		verify(this.log).info(this.message.capture());
@@ -89,7 +89,7 @@ public class EncodePasswordCommandTests {
 	}
 
 	@Test
-	public void encodeWithUnkownAlgorithShouldExitWithError() throws Exception {
+	public void encodeWithUnknownAlgorithmShouldExitWithError() throws Exception {
 		EncodePasswordCommand command = new EncodePasswordCommand();
 		ExitStatus status = command.run("--algorithm", "bad", "boot");
 		verify(this.log)

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

@@ -131,7 +131,7 @@ content into your application. Rather, pick only the properties that you need.
 	# OUTPUT
 	spring.output.ansi.enabled=detect # Configures the ANSI output.
 
-	# PID FILE ({sc-spring-boot}/system/ApplicationPidFileWriter.{sc-ext}[ApplicationPidFileWriter])
+	# PID FILE ({sc-spring-boot}/context/ApplicationPidFileWriter.{sc-ext}[ApplicationPidFileWriter])
 	spring.pid.fail-on-write-error= # Fails if ApplicationPidFileWriter is used but it cannot write the PID file.
 	spring.pid.file= # Location of the PID file to write (if ApplicationPidFileWriter is used).
 
@@ -1206,7 +1206,7 @@ content into your application. Rather, pick only the properties that you need.
 	management.endpoint.heapdump.cache.time-to-live=0ms # Maximum time that a response can be cached.
 	management.endpoint.heapdump.enabled= # Whether to enable the heapdump endpoint.
 
-	# HTTP TRACE ENDPOINT ({sc-spring-boot-actuator}/web/trace/HttpTraceEndpoint.{sc-ext}[HttpTraceEndpoint])
+	# HTTP TRACE ENDPOINT ({sc-spring-boot-actuator}/trace/http/HttpTraceEndpoint.{sc-ext}[HttpTraceEndpoint])
 	management.endpoint.httptrace.cache.time-to-live=0ms # Maximum time that a response can be cached.
 	management.endpoint.httptrace.enabled= # Whether to enable the HTTP trace endpoint.
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/ConfigurableWebServerApplicationContext.java

@@ -31,7 +31,7 @@ public interface ConfigurableWebServerApplicationContext
 
 	/**
 	 * Set the server namespace of the context.
-	 * @param serverNamespace the server namespance
+	 * @param serverNamespace the server namespace
 	 * @see #getServerNamespace()
 	 */
 	void setServerNamespace(String serverNamespace);

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/WebServerApplicationContext.java

@@ -21,7 +21,7 @@ import org.springframework.context.ApplicationContext;
 
 /**
  * Interface to be implemented by {@link ApplicationContext application contexts} that
- * create and manage the lifecyle of an embedded {@link WebServer}.
+ * create and manage the lifecycle of an embedded {@link WebServer}.
  *
  * @author Phillip Webb
  * @since 2.0.0
@@ -37,7 +37,7 @@ public interface WebServerApplicationContext extends ApplicationContext {
 
 	/**
 	 * Returns the namespace of the web server application context or {@code null} if no
-	 * namepace has been set. Used for disambiguation when multiple web servers are
+	 * namespace has been set. Used for disambiguation when multiple web servers are
 	 * running in the same application (for example a management context running on a
 	 * different port).
 	 * @return the server namespace

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/JavaBeanBinderTests.java

@@ -212,12 +212,12 @@ public class JavaBeanBinderTests {
 	}
 
 	@Test
-	public void bindToClassShouldBindToCollectionWithDelimeter() {
+	public void bindToClassShouldBindToCollectionWithDelimiter() {
 		MockConfigurationPropertySource source = new MockConfigurationPropertySource();
 		source.put("foo.collection", "foo-bar|bar-baz");
 		this.sources.add(source);
-		ExampleCollectionBeanWithDelimeter bean = this.binder
+		ExampleCollectionBeanWithDelimiter bean = this.binder
-				.bind("foo", Bindable.of(ExampleCollectionBeanWithDelimeter.class)).get();
+				.bind("foo", Bindable.of(ExampleCollectionBeanWithDelimiter.class)).get();
 		assertThat(bean.getCollection()).containsExactly(ExampleEnum.FOO_BAR,
 				ExampleEnum.BAR_BAZ);
 	}
@@ -629,7 +629,7 @@ public class JavaBeanBinderTests {
 
 	}
 
-	public static class ExampleCollectionBeanWithDelimeter {
+	public static class ExampleCollectionBeanWithDelimiter {
 
 		@Delimiter("|")
 		private Collection<ExampleEnum> collection;