Merge pull request #9610 from izeye:polish-20170627

* pr/9610:
  Polish

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

@@ -41,9 +41,9 @@ public class JpaBatchConfigurer extends BasicBatchConfigurer {
 	 * Create a new {@link BasicBatchConfigurer} instance.
 	 * @param properties the batch properties
 	 * @param dataSource the underlying data source
-	 * @param entityManagerFactory the entity manager factory (or {@code null})
 	 * @param transactionManagerCustomizers transaction manager customizers (or
 	 * {@code null})
+	 * @param entityManagerFactory the entity manager factory (or {@code null})
 	 */
 	protected JpaBatchConfigurer(BatchProperties properties, DataSource dataSource,
 			TransactionManagerCustomizers transactionManagerCustomizers,

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

@@ -306,7 +306,7 @@ class OnClassCondition extends SpringBootCondition
 					this.autoConfigurationMetadata);
 		}
 
-		private ConditionOutcome[] getOutcomes(final String[] autoConfigurationClasses,
+		private ConditionOutcome[] getOutcomes(String[] autoConfigurationClasses,
 				int start, int end, AutoConfigurationMetadata autoConfigurationMetadata) {
 			ConditionOutcome[] outcomes = new ConditionOutcome[end - start];
 			for (int i = start; i < end; i++) {

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

@@ -5434,7 +5434,7 @@ configuration is usually found.
 
 If you want to customize the primary configuration, you can use a nested
 `@TestConfiguration` class. Unlike a nested `@Configuration` class which would be used
-instead of a your application's primary configuration, a nested `@TestConfiguration` class
+instead of your application's primary configuration, a nested `@TestConfiguration` class
 will be used in addition to your application's primary configuration.
 
 NOTE: Spring's test framework will cache application contexts between tests. Therefore, as

spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBean.java

@@ -17,7 +17,7 @@
 package org.springframework.boot.admin;
 
 /**
- * A MBean contract to control and monitor a running {@code SpringApplication} via JMX.
+ * An MBean contract to control and monitor a running {@code SpringApplication} via JMX.
  * Intended for internal use only.
  *
  * @author Stephane Nicoll

spring-boot/src/main/java/org/springframework/boot/context/properties/bind/MapBinder.java

@@ -134,7 +134,7 @@ class MapBinder extends AggregateBinder<Map<Object, Object>> {
 			int start = this.root.getNumberOfElements() + 1;
 			int size = name.getNumberOfElements();
 			for (int i = start; i < size; i++) {
-				if (name.IsNumericIndex(i)) {
+				if (name.isNumericIndex(i)) {
 					return name.chop(i);
 				}
 			}

spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java

@@ -95,7 +95,7 @@ public final class ConfigurationPropertyName
 	}
 
 	/**
-	 * Return if the an element in the name is indexed.
+	 * Return if the element in the name is indexed.
 	 * @param elementIndex the index of the element
 	 * @return {@code true} if the element is indexed
 	 */
@@ -104,11 +104,11 @@ public final class ConfigurationPropertyName
 	}
 
 	/**
-	 * Return if the an element in the name is indexed and numeric.
+	 * Return if the element in the name is indexed and numeric.
 	 * @param elementIndex the index of the element
 	 * @return {@code true} if the element is indexed and numeric
 	 */
-	public boolean IsNumericIndex(int elementIndex) {
+	public boolean isNumericIndex(int elementIndex) {
 		return isIndexed(elementIndex)
 				&& isNumeric(getElement(elementIndex, Form.ORIGINAL));
 	}

spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySources.java

@@ -109,7 +109,7 @@ public final class ConfigurationPropertySources {
 	 * {@link StubPropertySource stub property sources}. Updates to the underlying source
 	 * will be automatically tracked.
 	 * @param sources the Spring property sources to adapt
-	 * @return an {@link Iterable} containing a single newly adapted
+	 * @return an {@link Iterable} containing newly adapted
 	 * {@link SpringConfigurationPropertySource} instances
 	 */
 	public static Iterable<ConfigurationPropertySource> from(
@@ -124,7 +124,7 @@ public final class ConfigurationPropertySources {
 	 * This method will flatten any nested property sources and will filter all
 	 * {@link StubPropertySource stub property sources}.
 	 * @param sources the Spring property sources to adapt
-	 * @return an {@link Iterable} containing a single newly adapted
+	 * @return an {@link Iterable} containing newly adapted
 	 * {@link SpringConfigurationPropertySource} instances
 	 */
 	public static Iterable<ConfigurationPropertySource> from(