Merge pull request #6728 from izeye:polish-20160823

* pr/6728:
  Polish

spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/LimitedEnvironmentEndpoint.java

@@ -73,7 +73,6 @@ public class LimitedEnvironmentEndpoint extends EnvironmentEndpoint {
 
 	@Override
 	public Object sanitize(String name, Object object) {
-		System.out.println(name);
 		if (name.equals("gopherProxySet")) {
 			return object;
 		}

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

@@ -112,7 +112,7 @@ public class DataSourcePublicMetrics implements PublicMetrics {
 
 	/**
 	 * Attempt to locate the primary {@link DataSource} (i.e. either the only data source
-	 * available or the one amongst the candidates marked as {@link Primary}. Return
+	 * available or the one amongst the candidates marked as {@link Primary}). Return
 	 * {@code null} if there no primary data source could be found.
 	 * @return the primary datasource
 	 */

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java

@@ -38,7 +38,7 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link DataSourceAutoConfiguration}.
+ * Tests for {@link JdbcTemplateAutoConfiguration}.
  *
  * @author Dave Syer
  * @author Stephane Nicoll

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

@@ -1243,7 +1243,7 @@ modules when you add new features to your application.
 
 If you want to replace the default `ObjectMapper` completely, either define a `@Bean` of
 that type and mark it as `@Primary`, or, if you prefer the builder-based
-approachd, define a `Jackson2ObjectMapperBuilder` `@Bean`. Note that in either case this
+approach, define a `Jackson2ObjectMapperBuilder` `@Bean`. Note that in either case this
 will disable all auto-configuration of the `ObjectMapper.
 
 If you provide any `@Beans` of type `MappingJackson2HttpMessageConverter` then
@@ -2766,7 +2766,7 @@ Check {spring-boot-maven-plugin-site}/examples/run-debug.html[this example] for
 [[howto-remote-debug-gradle-run]]
 === Remote debug a Spring Boot application started with Gradle
 To attach a remote debugger to a Spring Boot application started with Gradle you can use
-the `jvmArgs` property of bootRun task OR `--debug-jvm` command line option.
+the `jvmArgs` property of `bootRun` task or `--debug-jvm` command line option.
 
 `build.gradle`:
 

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

@@ -5507,7 +5507,7 @@ public class MyTest {
 		assertThat(headers.getLocation().toString(), containsString("myotherhost"));
 	}
 
-	@TestConfig
+	@TestConfiguration
 	static class Config {
 
 		@Bean

spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/SkipPropertyMapping.java

@@ -25,7 +25,7 @@ package org.springframework.boot.test.autoconfigure.properties;
 public enum SkipPropertyMapping {
 
 	/**
-	 * Skip the mapping the property.
+	 * Skip mapping the property.
 	 */
 	YES,
 

spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/AnnotationsPropertySourceTests.java

@@ -362,9 +362,7 @@ public class AnnotationsPropertySourceTests {
 	static @interface AttributeWithAliasAnnotation {
 
 		@AliasFor(annotation = AliasedAttributeAnnotation.class, attribute = "value")
-		String value()
-
-		default "foo";
+		String value() default "foo";
 
 		String someOtherAttribute() default "shouldNotBeMapped";
 

spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzer.java

@@ -26,7 +26,7 @@ import org.springframework.boot.diagnostics.FailureAnalysis;
 
 /**
  * An {@link AbstractFailureAnalyzer} that performs analysis of failures caused by a
- * {@link BeanNotOfRequiredTypeFailureAnalyzer}.
+ * {@link BeanNotOfRequiredTypeException}.
  *
  * @author Andy Wilkinson
  */