Merge branch '2.2.x' into 2.3.x

Closes gh-21744
This commit is contained in:
Phillip Webb
2020-06-07 10:27:35 -07:00
3 changed files with 3 additions and 3 deletions

View File

@@ -13,6 +13,7 @@ NOTE: Property contributions can come from additional jar files on your classpat
Also, you can define your own properties.
== Core properties
include::config-docs/core.adoc[]