Merge branch '1.3.x'

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

@@ -767,7 +767,7 @@ content into your application; rather pick only the properties that you need.
 	spring.mongodb.embedded.storage.replSetName= # Name of the replica set.
 	spring.mongodb.embedded.version=2.6.10 # Version of Mongo to use.
 
-	# REDIS ({sc-spring-boot-autoconfigure}/redis/RedisProperties.{sc-ext}[RedisProperties])
+	# REDIS ({sc-spring-boot-autoconfigure}/data/redis/RedisProperties.{sc-ext}[RedisProperties])
 	spring.redis.cluster.max-redirects= # Maximum number of redirects to follow when executing commands across the cluster.
 	spring.redis.cluster.nodes= # Comma-separated list of "host:port" pairs to bootstrap from.
 	spring.redis.database=0 # Database index used by the connection factory.

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

@@ -142,8 +142,8 @@ Spring's `Environment` abstraction:
 
 All Cloud Foundry properties are prefixed with `vcap`. You can use vcap properties to
 access application information (such as the public URL of the application) and service
-information (such as database credentials). See `VcapApplicationListener` Javadoc for
+information (such as database credentials). See `CloudFoundryVcapEnvironmentPostProcessor`
-complete details.
+Javadoc for complete details.
 
 TIP: The http://cloud.spring.io/spring-cloud-connectors/[Spring Cloud Connectors] project
 is a better fit for tasks such as configuring a DataSource. Spring Boot includes