Merge branch '2.1.x'

Closes gh-18735

Merge branch '2.1.x'
Closes gh-18735
25077de0 · Madhura Bhave · bc3c3232 · 593eca79 · 25077de0
Commit 25077de0 authored Oct 25, 2019 by Madhura Bhave
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

spring-boot-features.adoc ...ing-boot-docs/src/main/asciidoc/spring-boot-features.adoc +2 -0

No files found.
--- 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