Merge pull request #4446 from izeye/polish-20151112

* pr/4446:
  Polish docs

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

@@ -72,7 +72,7 @@ content into your application; rather pick only the properties that you need.
 	spring.cache.type= # Cache type, auto-detected according to the environment by default.
 
 	# SPRING CONFIG ({sc-spring-boot}/context/config/ConfigFileApplicationListener.{sc-ext}[ConfigFileApplicationListener])
-	spring.config.location= # Config file locations. TODO
+	spring.config.location= # Config file locations.
 	spring.config.name=application # Config file name.
 
 	# HAZELCAST ({sc-spring-boot-autoconfigure}/hazelcast/HazelcastProperties.{sc-ext}[HazelcastProperties])
@@ -606,7 +606,7 @@ content into your application; rather pick only the properties that you need.
 	spring.jta.bitronix.connectionfactory.password= # The password to use to connect to the JMS provider.
 	spring.jta.bitronix.connectionfactory.share-transaction-connections=false #  Whether or not connections in the ACCESSIBLE state can be shared within the context of a transaction.
 	spring.jta.bitronix.connectionfactory.test-connections=true # Whether or not connections should be tested when acquired from the pool.
-	spring.jta.bitronix.connectionfactory.two-pc-ordering-position=1 # The postion that this resource should take during two-phase commit (always first is Integer.MIN_VALUE, always last is Integer.MAX_VALUE).
+	spring.jta.bitronix.connectionfactory.two-pc-ordering-position=1 # The position that this resource should take during two-phase commit (always first is Integer.MIN_VALUE, always last is Integer.MAX_VALUE).
 	spring.jta.bitronix.connectionfactory.unique-name=jmsConnectionFactory # The unique name used to identify the resource during recovery.
 	spring.jta.bitronix.connectionfactory.use-tm-join=true Whether or not TMJOIN should be used when starting XAResources.
 	spring.jta.bitronix.connectionfactory.user= # The user to use to connect to the JMS provider.

spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc

@@ -700,7 +700,7 @@ NOTE: You need to add `compileJava.dependsOn(processResources)` to your build to
 that resources are processed before code is compiled. Without this directive any
 `additional-spring-configuration-metadata.json` files will not be processed.
 
-The processor will pickup both classes and methods that are annotated with
+The processor will pick up both classes and methods that are annotated with
 `@ConfigurationProperties`. The Javadoc for field values within configuration classes
 will be used to populate the `description` attribute.
 

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

@@ -1621,7 +1621,7 @@ not something you want to be on the classpath in production. It is a Hibernate f
 (nothing to do with Spring).
 
 
-[[howto-intialize-a-database-using-spring-jdbc]]
+[[howto-initialize-a-database-using-spring-jdbc]]
 === Initialize a database using Spring JDBC
 Spring JDBC has a `DataSource` initializer feature. Spring Boot enables it by default and
 loads SQL from the standard locations `schema.sql` and `data.sql` (in the root of the

spring-boot-samples/spring-boot-sample-data-gemfire/src/main/java/sample/data/gemfire/SampleDataGemFireApplication.java

@@ -23,7 +23,7 @@ import org.springframework.data.gemfire.repository.config.EnableGemfireRepositor
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
- * The GemstoneAppConfiguration class for allowing Spring Boot to pickup additional
+ * The GemstoneAppConfiguration class for allowing Spring Boot to pick up additional
  * application Spring configuration meta-data for GemFire, which must be specified in
  * Spring Data GemFire's XML namespace.
  *

spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java

@@ -353,7 +353,7 @@ public class PropertiesConfigurationFactory<T>
 	}
 
 	/**
-	 * Customize the databinder.
+	 * Customize the data binder.
 	 * @param dataBinder the data binder that will be used to bind and validate
 	 */
 	protected void customizeBinder(DataBinder dataBinder) {

spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java

@@ -161,7 +161,7 @@ public class PropertySourcesPropertyValues implements PropertyValues {
 				value = resolver.getProperty(propertyName, Object.class);
 			}
 			catch (RuntimeException ex) {
-				// Probably could not convert to Object, weird, but ignoreable
+				// Probably could not convert to Object, weird, but ignorable
 			}
 			if (value == null) {
 				value = source.getProperty(propertyName.toUpperCase());

spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java

@@ -72,7 +72,7 @@ public class YamlConfigurationFactory<T>
 
 	/**
 	 * Sets a validation constructor which will be applied to the YAML doc to see whether
-	 * it matches the expected Javabean.
+	 * it matches the expected JavaBean.
 	 * @param type the root type
 	 */
 	public YamlConfigurationFactory(Class<?> type) {

spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java

@@ -27,7 +27,7 @@ import org.yaml.snakeyaml.nodes.NodeId;
 
 /**
  * Extended version of snakeyaml's Constructor class to facilitate mapping custom YAML
- * keys to Javabean property names.
+ * keys to JavaBean property names.
  *
  * @author Luke Taylor
  */
@@ -57,8 +57,8 @@ public class YamlJavaBeanPropertyConstructor extends Constructor {
 	}
 
 	/**
-	 * Adds an alias for a Javabean property name on a particular type. The values of YAML
-	 * keys with the alias name will be mapped to the Javabean property.
+	 * Adds an alias for a JavaBean property name on a particular type. The values of YAML
+	 * keys with the alias name will be mapped to the JavaBean property.
 	 * @param alias the alias to map
 	 * @param type the type of property
 	 * @param name the property name

spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java

@@ -149,7 +149,7 @@ public abstract class AbstractLoggingSystem extends LoggingSystem {
 	/**
 	 * Reinitialize the logging system if required. Called when
 	 * {@link #getSelfInitializationConfig()} is used and the log file hasn't changed. May
-	 * be used to reload configuration (for example to pickup additional System
+	 * be used to reload configuration (for example to pick up additional System
 	 * properties).
 	 * @param initializationContext the logging initialization context
 	 */