Merge branch '1.5.x' into 2.0.x

wilkinsona · wilkinsona · commit 04119585e8d0 · 2018-06-25T13:13:34.000+01:00
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -4675,6 +4675,7 @@ TIP: It is also possible to transparently
 
 
 
+[[boot-features-caching-provider]]
 === Supported Cache Providers
 The cache abstraction does not provide an actual store and relies on abstraction
 materialized by the `org.springframework.cache.Cache` and
