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
commit 258f1d6c78
1 changed files with 10 additions and 4 deletions

View File

@ -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.