root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #24326 from dreis2211 

* pr/24326:
  Fix Asciidoc build step

Closes gh-24326
This commit is contained in:
Madhura Bhave 2020-12-03 16:30:49 -08:00
parent 977140053b b9ec88a7a5
commit 258f1d6c78
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View File

@ -733,14 +733,20 @@ For instance, the two examples below produce the same result:
[source,yaml,indent=0,configblocks] [source,yaml,indent=0,configblocks]
---- ----
spring.config.import=my.properties spring:
my.property=value config:
import: my.properties
my:
property: value
---- ----
[source,yaml,indent=0,configblocks] [source,yaml,indent=0,configblocks]
---- ----
my.property=value my:
spring.config.import=my.properties 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. In both of the above examples, the values from the `my.properties` file will take precedence over the file that triggered its import.