Merge branch '2.1.x'

Closes gh-18735
2019-10-24 17:02:33 -07:00
parent bc3c3232c2 593eca7998
commit 25077de0b3
1 changed files with 2 additions and 0 deletions
--- 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
@@ -1112,6 +1112,8 @@ For example, consider binding the following properties to a `Map`:

 The properties above will bind to a `Map` with `/key1`, `/key2` and `key3` as the keys in the map.

+NOTE: For YAML files, the brackets need to be surrounded by quotes for the keys to be parsed properly.
+

 [[boot-features-external-config-complex-type-merge]]
 ==== Merging Complex Types