From b9ec88a7a5b8714a48d919dd7418da4501d0eeb4 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Thu, 3 Dec 2020 23:08:43 +0100 Subject: [PATCH] Fix Asciidoc build step See gh-24326 --- .../src/docs/asciidoc/spring-boot-features.adoc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc index 7f8cd146760..fee7e8bb423 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc @@ -733,14 +733,20 @@ For instance, the two examples below produce the same result: [source,yaml,indent=0,configblocks] ---- -spring.config.import=my.properties -my.property=value + spring: + config: + import: my.properties + my: + property: value ---- [source,yaml,indent=0,configblocks] ---- -my.property=value -spring.config.import=my.properties + my: + property: value + spring: + config: + import: my.properties ---- In both of the above examples, the values from the `my.properties` file will take precedence over the file that triggered its import.