Merge pull request #4069 from izeye/polish-20151001

* pr/4069:
  Polish

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java

@@ -148,7 +148,7 @@ public class JobLauncherCommandLineRunner implements CommandLineRunner,
 			else if (isStoppedOrFailed(previousExecution) && job.isRestartable()) {
 				// Retry a failed or stopped execution
 				parameters = previousExecution.getJobParameters();
-				// Non-identifying additional parameters can be added to a retry
+				// Non-identifying additional parameters can be removed to a retry
 				removeNonIdentifying(additionals);
 			}
 			else if (incrementer != null) {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AllNestedConditions.java

@@ -23,7 +23,7 @@ import org.springframework.context.annotation.Condition;
  * to create composite conditions, for example:
  *
  * <pre class="code">
- * static class OnJndiOrProperty extends AllNestedConditions {
+ * static class OnJndiAndProperty extends AllNestedConditions {
  *
  *    &#064;ConditionalOnJndi()
  *    static class OnJndi {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java

@@ -88,7 +88,7 @@ public final class ConditionEvaluationReport {
 	}
 
 	/**
-	 * Records the name of the classes that have been excluded from condition evaluation.
+	 * Records the names of the classes that have been excluded from condition evaluation.
 	 * @param exclusions the names of the excluded classes
 	 */
 	public void recordExclusions(Collection<String> exclusions) {
@@ -134,7 +134,7 @@ public final class ConditionEvaluationReport {
 	}
 
 	/**
-	 * Returns the name of the classes that have been excluded from condition evaluation.
+	 * Returns the names of the classes that have been excluded from condition evaluation.
 	 * @return the names of the excluded classes
 	 */
 	public List<String> getExclusions() {
@@ -142,7 +142,7 @@ public final class ConditionEvaluationReport {
 	}
 
 	/**
-	 * Returns the name of the classes that were evaluated but were not conditional.
+	 * Returns the names of the classes that were evaluated but were not conditional.
 	 * @return the names of the unconditional classes
 	 */
 	public Set<String> getUnconditionalClasses() {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditions.java

@@ -23,7 +23,7 @@ import org.springframework.context.annotation.Condition;
  * be used to create composite conditions, for example:
  *
  * <pre class="code">
- * static class OnJndiOrProperty extends NoneOfNestedConditions {
+ * static class OnNeitherJndiNorProperty extends NoneOfNestedConditions {
  *
  *    &#064;ConditionalOnJndi()
  *    static class OnJndi {

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

@@ -43,7 +43,7 @@ class OnEnabledResourceChainCondition extends SpringBootCondition {
 		binder.bind(new PropertySourcesPropertyValues(environment.getPropertySources()));
 		Boolean match = properties.getChain().getEnabled();
 		return new ConditionOutcome(match, "Resource chain is "
-				+ (match ? "enabled" : "disabled" + ")"));
+				+ (match ? "enabled" : "disabled"));
 	}
 
 }

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

@@ -197,7 +197,7 @@ content into your application; rather pick only the properties that you need.
 	spring.jackson.parser.*= # see Jackson's JsonParser.Feature
 	spring.jackson.serialization.*= # see Jackson's SerializationFeature
 	spring.jackson.serialization-inclusion= # Controls the inclusion of properties during serialization (see Jackson's JsonInclude.Include)
-	spring.jackson.time-zone # Time zone used when formatting dates. Configured using any recognized time zone identifier, for example "America/Los_Angeles" or "GMT+10"
+	spring.jackson.time-zone= # Time zone used when formatting dates. Configured using any recognized time zone identifier, for example "America/Los_Angeles" or "GMT+10"
 
 	# THYMELEAF ({sc-spring-boot-autoconfigure}/thymeleaf/ThymeleafAutoConfiguration.{sc-ext}[ThymeleafAutoConfiguration])
 	spring.thymeleaf.check-template-location=true

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

@@ -2574,7 +2574,7 @@ server using the URL `mongodb://localhost/test`:
 	}
 ----
 
-You can set `spring.data.mongodb.uri` property to change the `url` and configure
+You can set `spring.data.mongodb.uri` property to change the URL and configure
 additional settings such as the _replica set_:
 
 [source,properties,indent=0]
@@ -2990,7 +2990,7 @@ a `HazelcastInstance` has been auto-configured, it is automatically wrapped in a
 `CacheManager`.
 
 If for some reason you need a different `HazelcastInstance` for caching, you can
-request Spring Boot to create a separate one that will only used by the
+request Spring Boot to create a separate one that will be only used by the
 `CacheManager`:
 
 [source,properties,indent=0]

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

@@ -622,7 +622,7 @@ you can use the exclude attribute of `@EnableAutoConfiguration` to disable them.
 
 If the class is not on the classpath, you can use the `excludeName` attribute of
 the annotation and specify the fully qualified name instead. Finally, you can also
-control the list of auto-configuration classes to excludes via the
+control the list of auto-configuration classes to exclude via the
 `spring.autoconfigure.exclude` property.
 
 TIP: You can define exclusions both at the annotation level and using the property.

spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java

@@ -355,7 +355,7 @@ public class RelaxedDataBinderTests {
 	}
 
 	@Test
-	public void testBindNestedMapOfStringWithUnderscoreAndupperCase() throws Exception {
+	public void testBindNestedMapOfStringWithUnderscoreAndUpperCase() throws Exception {
 		TargetWithNestedMapOfString target = new TargetWithNestedMapOfString();
 		bind(target, "NESTED_FOO: bar\n" + "NESTED_VALUE_FOO: 123");
 		assertEquals("bar", target.getNested().get("FOO"));