Skip to content

Commit 258f1d6

Browse files
committed
Merge pull request #24326 from dreis2211
* pr/24326: Fix Asciidoc build step Closes gh-24326
2 parents 9771400 + b9ec88a commit 258f1d6

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -733,14 +733,20 @@ For instance, the two examples below produce the same result:
733733

734734
[source,yaml,indent=0,configblocks]
735735
----
736-
spring.config.import=my.properties
737-
my.property=value
736+
spring:
737+
config:
738+
import: my.properties
739+
my:
740+
property: value
738741
----
739742

740743
[source,yaml,indent=0,configblocks]
741744
----
742-
my.property=value
743-
spring.config.import=my.properties
745+
my:
746+
property: value
747+
spring:
748+
config:
749+
import: my.properties
744750
----
745751

746752
In both of the above examples, the values from the `my.properties` file will take precedence over the file that triggered its import.

0 commit comments

Comments
 (0)