Merge branch '1.5.x'

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

@@ -430,6 +430,8 @@ content into your application; rather pick only the properties that you need.
 	security.filter-order=0 # Security filter chain order.
 	security.filter-dispatcher-types=ASYNC, FORWARD, INCLUDE, REQUEST # Security filter chain dispatcher types.
 	security.headers.cache=true # Enable cache control HTTP headers.
+	security.headers.content-security-policy= # Value for content security policy header.
+	security.headers.content-security-policy-mode=default # Content security policy mode (default, report-only).
 	security.headers.content-type=true # Enable "X-Content-Type-Options" header.
 	security.headers.frame=true # Enable "X-Frame-Options" header.
 	security.headers.hsts= # HTTP Strict Transport Security (HSTS) mode (none, domain, all).

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

@@ -811,7 +811,7 @@ If you are using Jolokia but you don't want Spring Boot to configure it, simply
 == Loggers
 Spring Boot Actuator includes the ability to view and configure the log levels of your
 application at runtime.  You can view either the entire list or an individual logger's
-configuration which is made up of both the explictily configured logging level as well as
+configuration which is made up of both the explicitly configured logging level as well as
 the effective logging level given to it by the logging framework.  These levels can be:
 
 * `TRACE`
@@ -823,7 +823,7 @@ the effective logging level given to it by the logging framework.  These levels
 * `OFF`
 * `null`
 
-with `null` indicating that there is no explict configuration.
+with `null` indicating that there is no explicit configuration.
 
 
 

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

@@ -3883,7 +3883,7 @@ abstraction expects. No further customization is applied on it.
 EhCache 2.x is used if a file named `ehcache.xml` can be found at the root of the
 classpath. If EhCache 2.x, the `EhCacheCacheManager` provided by the
 `spring-boot-starter-cache` '`Starter`' and such file is present it is used to bootstrap
-the cache manager. An alternate configuration file can be provide a well using:
+the cache manager. An alternate configuration file can be provided as well using:
 
 [source,properties,indent=0]
 ----

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

@@ -769,7 +769,7 @@ dependencies out-of-the-box so you may want to have a look to the
 {propdeps-plugin}[`propdeps-plugin`] in the meantime.
 
 TIP: repackaged archives do not contain devtools by default. If you want to use
-<<using-boot-devtools-remote,certain remote devtools feature>>, you'll need to enable the
+<<using-boot-devtools-remote,certain remote devtools feature>>, you'll need to disable the
 `excludeDevtools` build property to include it. The property is supported with both the
 Maven and Gradle plugins.