Merge branch '2.1.x'

snicoll · snicoll · commit da24a66ce6a1 · 2019-11-05T09:19:51.000+01:00
Closes gh-18875
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
@@ -3743,6 +3743,7 @@ You can define beans for the following jOOQ Types:
 * `TransactionProvider`
 * `RecordMapperProvider`
 * `RecordUnmapperProvider`
+* `Settings`
 * `RecordListenerProvider`
 * `ExecuteListenerProvider`
 * `VisitListenerProvider`
